@agoric/deploy-script-support 0.11.0 → 0.11.1-upgrade-23-dev-bd79330.0.bd79330

package/src/coreProposalBehavior.js

@@ -3,17 +3,12 @@ const t = 'makeCoreProposalBehavior';
 
 /**
  * @import {Installation} from '@agoric/zoe/src/zoeService/utils.js';
+ * @import {E} from '@endo/far';
+ * @import {ManifestBundleRef} from './externalTypes.js';
+ * @import {BootstrapPowers, ChainBootstrapSpace} from '@agoric/vats/src/core/types.js';
  */
 
 /**
- * TODO import these from @agoric/vats when the types are better managed
- *
- * @typedef {*} ChainBootstrapSpace
- * @typedef {*} BootstrapPowers
- */
-
-/**
- * @import {ManifestBundleRef} from './externalTypes.js'
  * @typedef {[methodName: string, ...args: unknown[]]} FlatMethargs
  * @typedef {Record<string, Record<string, unknown>>} Manifest
  */
@@ -44,9 +39,9 @@ export const permits = {
  * @param {ManifestBundleRef} inputs.manifestBundleRef
  * @param {FlatMethargs} inputs.getManifestCall
  * @param {Manifest} [inputs.customManifest]
- * @param {typeof import('@endo/far').E} inputs.E
+ * @param {typeof E} inputs.E
  * @param {(...args: unknown[]) => void} [inputs.log]
- * @param {(ref: import('./externalTypes.js').ManifestBundleRef) => Promise<import('@agoric/zoe/src/zoeService/utils.js').Installation<unknown>>} [inputs.customRestoreRef]
+ * @param {(ref: ManifestBundleRef) => Promise<Installation<unknown>>} [inputs.customRestoreRef]
  * @returns {(vatPowers: unknown) => Promise<unknown>}
  */
 export const makeCoreProposalBehavior = ({
@@ -83,7 +78,7 @@ export const makeCoreProposalBehavior = ({
   };
 
   const makeRestoreRef = (vatAdminSvc, zoe) => {
-    /** @type {(ref: import('./externalTypes.js').ManifestBundleRef) => Promise<Installation<unknown>>} */
+    /** @type {(ref: ManifestBundleRef) => Promise<Installation<unknown>>} */
     const defaultRestoreRef = async bundleRef => {
       // extract-proposal.js creates these records, and bundleName is
       // the optional name under which the bundle was installed into
@@ -193,7 +188,7 @@ export const makeCoreProposalBehavior = ({
 /**
  * @param {object} inputs
  * @param {Array<{ ref: ManifestBundleRef, call: FlatMethargs, customManifest?: Manifest }>} inputs.metadataRecords
- * @param {typeof import('@endo/far').E} inputs.E
+ * @param {typeof E} inputs.E
  */
 export const makeEnactCoreProposalsFromBundleRef = ({ metadataRecords, E }) => {
   /**

package/src/depositInvitation.js

@@ -3,7 +3,8 @@ import { E } from '@endo/far';
 
 /**
  * @import {Amount, Brand, Issuer, Payment, Purse} from '@agoric/ertp';
- * @import {InvitationDetails} from '@agoric/zoe';
+ * @import {Invitation, InvitationDetails} from '@agoric/zoe';
+ * @import {ERef} from '@agoric/vow';
  */
 
 /**

package/src/endo-pieces-contract.js

@@ -4,6 +4,11 @@ import { E, Far } from '@endo/far';
 import { encodeBase64, decodeBase64 } from '@endo/base64';
 import { ZipWriter } from '@endo/zip';
 
+/**
+ * @import {ZoeService} from '@agoric/zoe';
+ * @import {ERef} from '@agoric/vow';
+ */
+
 export const start = () => {
   /** @type { Map<string, [string, Uint8Array]>} */
   const hashToEntry = new Map();

package/src/externalTypes.js

@@ -3,6 +3,15 @@ export {};
 
 /**
  * @import {NameHub} from '@agoric/vats';
+ * @import {ZoeService} from '@agoric/zoe';
+ * @import {BundleSource} from '@endo/bundle-source';
+ * @import {writeFile as WriteFile} from 'node:fs/promises';
+ * @import {ERef} from '@agoric/vow';
+ * @import {ScratchPad} from '@agoric/internal/src/scratch.js';
+ * @import {CoreEvalMaterialRecord} from './writeCoreEvalParts.js';
+ * @import {Bank} from '@agoric/vats/src/vat-bank.js';
+ * @import {Board} from '@agoric/vats';
+ * @import {NameAdmin} from '@agoric/vats';
  */
 
 // TODO move this type somewhere better
@@ -54,30 +63,33 @@ export {};
 
 /**
  * @typedef {{
- *  bundleSource: typeof import('@endo/bundle-source').default,
+ *  bundleSource: BundleSource,
  *  cacheDir: string,
  *  lookup: (...path: string[]) => unknown,
+ *  log?: typeof console.log,
  *  now: () => number,
+ *  onWriteCoreEval?: (record: CoreEvalMaterialRecord) => void | Promise<void>,
  *  pathResolve: (...path: string[]) => string,
  *  publishBundle: PublishBundleRef,
  *  scriptArgs?: string[],
+ *  writeFile?: WriteFile,
  * }} DeployScriptEndownments
  */
 
 /**
  * @typedef {{
- *   scratch: ERef<import('@agoric/internal/src/scratch.js').ScratchPad>,
+ *   scratch: ERef<ScratchPad>,
  * }} CommonHome
  */
 
-// TODO wallet as import('@agoric/wallet-backend/src/types').WalletAdmin once it's a module
+// TODO wallet as import('@agoric/wallet-backend/src/types.js').WalletAdmin once it's a module
 /**
  * @typedef {CommonHome & {
  * agoricNames: ERef<NameHub>,
- * bank: ERef<import("@agoric/vats/src/vat-bank.js").Bank>,
- * board: ERef<import("@agoric/vats").Board>,
+ * bank: ERef<Bank>,
+ * board: ERef<Board>,
  * faucet: unknown,
- * myAddressNameAdmin: ERef<import("@agoric/vats").NameAdmin>,
+ * myAddressNameAdmin: ERef<NameAdmin>,
  * namesByAddress: ERef<NameHub>,
  * wallet: any,
  * zoe: ERef<ZoeService>,

package/src/extract-proposal.js

@@ -1,9 +1,9 @@
 // @ts-check
 import { Fail } from '@endo/errors';
 import { deeplyFulfilledObject } from '@agoric/internal';
-import fs from 'fs';
-import { createRequire } from 'module';
-import path from 'path';
+import fs from 'node:fs';
+import { createRequire } from 'node:module';
+import path from 'node:path';
 
 import { defangAndTrim, stringify } from './code-gen.js';
 import {
@@ -11,6 +11,11 @@ import {
   makeEnactCoreProposalsFromBundleRef,
 } from './coreProposalBehavior.js';
 
+/**
+ * @import {CoreEvalBuilder} from './externalTypes.js';
+ * @import {PublishBundleRef} from './externalTypes.js';
+ */
+
 /**
  * @typedef {string | {module: string, entrypoint?: string, args?: Array<unknown>}} ConfigProposal
  */
@@ -155,7 +160,7 @@ export const extractCoreProposalBundles = async (
           const thisProposalSequence = getSequenceForProposal(key);
           const initPath = findModule(dirname, module);
           const initDir = path.dirname(initPath);
-          /** @type {Record<string, import('./externalTypes.js').CoreEvalBuilder>} */
+          /** @type {Record<string, CoreEvalBuilder>} */
           const ns = await import(initPath);
           const install = (srcSpec, bundlePath) => {
             const absoluteSrc = findModule(initDir, srcSpec);
@@ -181,7 +186,7 @@ export const extractCoreProposalBundles = async (
             );
             return bundleHandle;
           };
-          /** @type {import('./externalTypes.js').PublishBundleRef} */
+          /** @type {PublishBundleRef} */
           const publishRef = async handleP => {
             const handle = await handleP;
             bundleHandleToAbsolutePaths.has(handle) ||

package/src/getBundlerMaker.js

@@ -11,9 +11,13 @@
  * linked with https://github.com/agoric/agoric-sdk/issues/4564
  */
 import { E } from '@endo/far';
-import url from 'url';
+import url from 'node:url';
 
-/** @typedef {ReturnType<import('./endo-pieces-contract.js')['start']>['publicFacet']} BundleMaker */
+/**
+ * @import {start} from './endo-pieces-contract.js';
+ */
+
+/** @typedef {ReturnType<typeof start>['publicFacet']} BundleMaker */
 /** @typedef {ReturnType<BundleMaker['makeBundler']>} Bundler */
 
 export const makeGetBundlerMaker =

package/src/helpers.js

@@ -1,12 +1,10 @@
 // @ts-check
 
-/// <reference path="../../zoe/exported.js" />
-
 import { E } from '@endo/far';
 import bundleSource from '@endo/bundle-source';
 
-import fs from 'fs/promises';
-import os from 'os';
+import fs from 'node:fs/promises';
+import os from 'node:os';
 
 import { makeInstall } from './install.js';
 import { makeOfferAndFindInvitationAmount } from './offer.js';
@@ -19,6 +17,13 @@ import { assertOfferResult } from './assertOfferResult.js';
 import { installInPieces } from './installInPieces.js';
 import { makeWriteCoreEval } from './writeCoreEvalParts.js';
 
+/**
+ * @import {CommonHome} from './externalTypes.js';
+ * @import {AgSoloHome} from './externalTypes.js';
+ * @import {DeployScriptEndownments} from './externalTypes.js';
+ * @import {WriteCoreEval} from './writeCoreEvalParts.js';
+ */
+
 export * from '@agoric/internal/src/node/createBundles.js';
 export { parseScriptArgs } from './parseCoreEvalArgs.js';
 
@@ -54,8 +59,8 @@ const makeLazyObject = sourceObject => {
 };
 
 /**
- * @param {Promise<import('./externalTypes.js').CommonHome | import('./externalTypes.js').AgSoloHome>} homePromise
- * @param {import('./externalTypes.js').DeployScriptEndownments} endowments
+ * @param {Promise<CommonHome | AgSoloHome>} homePromise
+ * @param {DeployScriptEndownments} endowments
  */
 export const makeHelpers = async (homePromise, endowments) => {
   // Endowments provided via `agoric run` or `agoric deploy`.
@@ -65,6 +70,9 @@ export const makeHelpers = async (homePromise, endowments) => {
     publishBundle,
     pathResolve,
     cacheDir = pathResolve(os.homedir(), '.agoric/cache'),
+    onWriteCoreEval,
+    writeFile,
+    log,
   } = endowments;
 
   // Internal-to-this-function lazy dependencies.
@@ -146,11 +154,14 @@ export const makeHelpers = async (homePromise, endowments) => {
     get getBundlerMaker() {
       return makeGetBundlerMaker(homePromise, { bundleSource, lookup });
     },
-    /** @returns {import('./writeCoreEvalParts.js').WriteCoreEval} */
+    /** @returns {WriteCoreEval} */
     get writeCoreEval() {
       return makeWriteCoreEval(homePromise, endowments, {
         getBundleSpec: deps.cacheAndGetBundleSpec,
         getBundlerMaker: helpers.getBundlerMaker,
+        ...(onWriteCoreEval && { onWriteCoreEval }),
+        ...(log && { log }),
+        ...(writeFile && { writeFile }),
       });
     },
     /** @deprecated use writeCoreEval */
@@ -158,6 +169,9 @@ export const makeHelpers = async (homePromise, endowments) => {
       return makeWriteCoreEval(homePromise, endowments, {
         getBundleSpec: deps.cacheAndGetBundleSpec,
         getBundlerMaker: helpers.getBundlerMaker,
+        ...(onWriteCoreEval && { onWriteCoreEval }),
+        ...(log && { log }),
+        ...(writeFile && { writeFile }),
       });
     },
   });

package/src/install.js

@@ -3,13 +3,18 @@ import './externalTypes.js';
 
 import { E } from '@endo/far';
 
-/** @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js' */
+/**
+ * @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js'
+ * @import {Installation, ZoeService} from '@agoric/zoe';
+ * @import {InstallationManager} from './startInstance.js';
+ * @import {ERef} from '@agoric/vow';
+ */
 
 // XXX board is Board but specifying that leads to type errors with imports which aren't worth fixing right now
 /**
  * @param {typeof import('@endo/bundle-source')['default']} bundleSource
  * @param {ERef<ZoeService>} zoe
- * @param {ERef<import('./startInstance.js').InstallationManager>} installationManager
+ * @param {ERef<InstallationManager>} installationManager
  * @param {ERef<any>} board
  * @param {(bundle: any) => any} [publishBundle]
  * @param {(path: string) => string} [pathResolve]

package/src/installInPieces.js

@@ -2,7 +2,7 @@
 import { E } from '@endo/far';
 import { ZipReader } from '@endo/zip';
 import { encodeBase64, decodeBase64 } from '@endo/base64';
-import crypto from 'crypto';
+import crypto from 'node:crypto';
 
 const computeSha512 = bytes => {
   const hash = crypto.createHash('sha512');

package/src/offer.js

@@ -3,11 +3,13 @@ import { assert } from '@endo/errors';
 import { E } from '@endo/far';
 // Avoid pulling in too many dependencies like notifiers
 import { AmountMath } from '@agoric/ertp/src/amountMath.js';
+import { objectMap } from '@agoric/internal';
 
 /**
  * @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js';
  * @import {Amount, Brand, Issuer, Payment, Purse} from '@agoric/ertp';
- * @import {InvitationDetails, Keyword, Proposal} from '@agoric/zoe';
+ * @import {Invitation, InvitationAmount, InvitationDetails, Keyword, Proposal, ProposalRecord, ZoeService} from '@agoric/zoe';
+ * @import {ERef} from '@agoric/vow';
  */
 
 /**
@@ -53,17 +55,22 @@ export const makeOfferAndFindInvitationAmount = (
     return AmountMath.make(invitationAmount.brand, value);
   };
 
+  /**
+   * @param {Partial<ProposalRecord>} proposal
+   * @param {Record<Keyword, Petname>} paymentsWithPursePetnames
+   * @returns {Record<Keyword, ERef<Payment>>} payments
+   */
   const withdrawPayments = (proposal, paymentsWithPursePetnames) => {
-    return Object.fromEntries(
-      Object.entries(paymentsWithPursePetnames).map(
-        ([keyword, pursePetname]) => {
-          const purse = E(walletAdmin).getPurse(pursePetname);
-          const amountToWithdraw = proposal.give[keyword];
-          const paymentP = E(purse).withdraw(amountToWithdraw);
-          return [keyword, paymentP];
-        },
-      ),
-    );
+    return objectMap(paymentsWithPursePetnames, (pursePetname, keyword) => {
+      const purse = E(walletAdmin).getPurse(pursePetname);
+      assert(
+        'give' in proposal && proposal.give,
+        `proposal.give is required to withdraw`,
+      );
+      const amountToWithdraw = proposal.give[keyword];
+      const paymentP = E(purse).withdraw(amountToWithdraw);
+      return paymentP;
+    });
   };
 
   const withdrawInvitation = async invitationDetails => {

package/src/parseCoreEvalArgs.js

@@ -2,7 +2,7 @@
  * To customize proposals for multiple environments, we pass the "variant"
  * identifier in scriptArgs. The variant must match a knownVariant.
  *
- * @param {import('./externalTypes.js').DeployScriptEndownments} endowments
+ * @param {DeployScriptEndownments} endowments
  * @param {string} name a name to use in error messages or Usage suggestions.
  * @param {string[]} knownVariants
  */
@@ -12,6 +12,10 @@ export const parseScriptArgs = async (endowments, name, knownVariants) => {
   const variantOrConfig =
     scriptArgs && scriptArgs.length > 0 ? scriptArgs : undefined;
 
+  /**
+   * @import {DeployScriptEndownments} from './externalTypes.js';
+   */
+
   console.log(`${name}`, variantOrConfig);
 
   const Usage = `agoric run ${name}.js ${[...knownVariants, '<json-config>'].join(' | ')}`;

package/src/saveIssuer.js

@@ -4,12 +4,14 @@ import { E } from '@endo/far';
 /**
  * @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js';
  * @import {Amount, Brand, Issuer, Payment} from '@agoric/ertp';
+ * @import {IssuerManager} from './startInstance.js';
+ * @import {ERef} from '@agoric/vow';
  */
 
 /**
  * @param {ERef<any>} walletAdmin - an internal type of the
  * wallet, not defined here
- * @param {ERef<import('./startInstance.js').IssuerManager>} issuerManager
+ * @param {ERef<IssuerManager>} issuerManager
  */
 export const makeSaveIssuer = (walletAdmin, issuerManager) => {
   /**

package/src/startInstance.js

@@ -1,11 +1,13 @@
 // @ts-check
+import { objectMap } from '@agoric/internal';
 import { assert } from '@endo/errors';
 import { E, passStyleOf } from '@endo/far';
 
 /**
  * @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js';
  * @import {Amount, Brand, Issuer, Payment, Purse} from '@agoric/ertp';
- * @import {IssuerKeywordRecord, Keyword} from '@agoric/zoe';
+ * @import {Instance, Installation, IssuerKeywordRecord, Keyword, ZoeService} from '@agoric/zoe';
+ * @import {ERef} from '@agoric/vow';
  */
 
 /**
@@ -36,13 +38,8 @@ export const makeStartInstance = (
   zoeInvitationPurse,
 ) => {
   const makeIssuerKeywordRecord = issuerPetnameKeywordRecord => {
-    return Object.fromEntries(
-      Object.entries(issuerPetnameKeywordRecord).map(
-        ([keyword, issuerPetname]) => {
-          const issuerP = E(issuerManager).get(issuerPetname);
-          return [keyword, issuerP];
-        },
-      ),
+    return objectMap(issuerPetnameKeywordRecord, issuerPetname =>
+      E(issuerManager).get(issuerPetname),
     );
   };
 

package/src/wallet-utils.js

@@ -0,0 +1,150 @@
+/* global globalThis */
+/**
+ * @file Reusable wallet utilities for portfolio contract testing and operations
+ *
+ * This module consolidates wallet-related utilities that were previously
+ * duplicated across multichain-testing and a3p-integration.
+ */
+
+import { retryUntilCondition } from '@agoric/client-utils';
+import { YMAX_CONTROL_WALLET_KEY } from '@agoric/portfolio-api/src/portfolio-constants.js';
+
+/**
+ * @import {UpdateRecord} from '@agoric/smart-wallet/src/smartWallet.js';
+ * @import {RetryOptions} from '@agoric/client-utils';
+ * @import {SigningSmartWalletKit} from '@agoric/client-utils';
+ * @import {Instance} from '@agoric/zoe';
+ * @import {BridgeAction} from '@agoric/smart-wallet/src/smartWallet.js';
+ */
+
+/**
+ * Helper to wait for specific wallet updates
+ *
+ * This provides a higher-level API over retryUntilCondition for common
+ * wallet update patterns.
+ *
+ * @param {() => Promise<UpdateRecord>} getLastUpdate
+ * @param {RetryOptions & {
+ *   log: (...args: unknown[]) => void;
+ *   setTimeout: typeof globalThis.setTimeout;
+ * }} retryOpts
+ */
+export const walletUpdates = (getLastUpdate, retryOpts) => {
+  return harden({
+    /**
+     * Wait for an invocation to complete
+     * @param {string | number} id
+     */
+    invocation: async id => {
+      const done = /** @type {UpdateRecord & { updated: 'invocation' }} */ (
+        await retryUntilCondition(
+          getLastUpdate,
+          update =>
+            update.updated === 'invocation' &&
+            update.id === id &&
+            !!(update.result || update.error),
+          `${id}`,
+          retryOpts,
+        )
+      );
+      if (done.error) throw Error(done.error);
+      return done.result;
+    },
+
+    /**
+     * Wait for an offer to complete
+     * @param {string | number} id
+     */
+    offerResult: async id => {
+      const done = await retryUntilCondition(
+        getLastUpdate,
+        update =>
+          // walletAction implies an error, so also stop on that
+          update.updated === 'walletAction' ||
+          // if it's offerStatus, it can be in progress until result or error
+          (update.updated === 'offerStatus' &&
+            update.status.id === id &&
+            (!!update.status.result || !!update.status.error)),
+        `${id}`,
+        retryOpts,
+      );
+      switch (done.updated) {
+        case 'walletAction':
+          throw Error(`walletAction failure: ${done.status.error}`);
+        case 'offerStatus':
+          if (done.status.error) {
+            throw Error(`offerStatus failure: ${done.status.error}`);
+          }
+          if (!done.status.result) {
+            throw Error(`offerStatus missing result`);
+          }
+          return done.status.result;
+        default:
+          throw Error(`unexpected update type ${done.updated}`);
+      }
+    },
+  });
+};
+
+/**
+ * Redeem the ymaxControl invitation from the postal service
+ *
+ * This is a common pattern in ymax testing where we need to redeem
+ * the control facet invitation delivered via postal service.
+ *
+ * @param {{
+ *   sig: SigningSmartWalletKit;
+ *   postalServiceInstance: Instance;
+ *   fresh: () => string | number;
+ *   log?: (...args: unknown[]) => void;
+ * }} options
+ * @returns {Promise<void>}
+ */
+export const redeemYmaxControlInvitation = async ({
+  sig,
+  postalServiceInstance,
+  fresh,
+  log = () => {},
+}) => {
+  const id = `redeem-${YMAX_CONTROL_WALLET_KEY}-${fresh()}`;
+  log('Redeeming ymaxControl invitation', id);
+
+  /** @type {BridgeAction} */
+  const redeemAction = harden({
+    method: 'executeOffer',
+    offer: {
+      id,
+      invitationSpec: {
+        source: 'purse',
+        instance: postalServiceInstance,
+        description: `deliver ${YMAX_CONTROL_WALLET_KEY}`,
+      },
+      proposal: {},
+      saveResult: { name: YMAX_CONTROL_WALLET_KEY, overwrite: true },
+    },
+  });
+
+  const tx = await sig.sendBridgeAction(redeemAction);
+  if (tx.code !== 0) {
+    throw Error(`Failed to redeem invitation: ${tx.rawLog}`);
+  }
+
+  const wup = walletUpdates(sig.query.getLastUpdate, {
+    setTimeout: globalThis.setTimeout,
+    log,
+  });
+
+  await wup.offerResult(id);
+  log('ymaxControl invitation redeemed successfully');
+};
+
+/**
+ * Helper to create action IDs with a consistent format
+ *
+ * @param {string} description
+ * @param {() => string | number} [fresh]
+ * @returns {string}
+ */
+export const makeActionId = (description, fresh = () => Date.now()) => {
+  return `${description}.${fresh()}`;
+};

package/src/writeCoreEvalParts.js

@@ -1,5 +1,5 @@
 // @ts-check
-import fs from 'fs';
+import fs from 'node:fs';
 import { E } from '@endo/far';
 import { deeplyFulfilled } from '@endo/marshal';
 
@@ -12,7 +12,9 @@ import {
 
 /**
  * @import {BundleSource, BundleSourceResult} from '@endo/bundle-source';
- * @import {AgSoloHome, CanonicalHome, CommonHome, CoreEvalBuilder, CoreEvalDescriptor, ManifestBundleRef} from './externalTypes.js';
+ * @import {AgSoloHome, CommonHome, CoreEvalBuilder, CoreEvalDescriptor, ManifestBundleRef} from './externalTypes.js';
+ * @import {BundleMaker} from './getBundlerMaker.js';
+ * @import {Bundler} from './getBundlerMaker.js';
  */
 
 /**
@@ -20,7 +22,14 @@ import {
  * @property {string} name
  * @property {string} permit
  * @property {string} script
- * @property {{entrypoint: string, bundleID: string, fileName: string}[]} bundles
+ * @property {{entrypoint: string, bundleID?: string, bundleName?: string, fileName?: string}[]} bundles
+ */
+/**
+ * @typedef {{
+ *   plan: CoreEvalPlan,
+ *   eval: { json_permits: string, js_code: string },
+ *   bundles: { entrypoint: string, bundleID?: string, bundleName?: string, fileName?: string, bundle: BundleSourceResult<'endoZipBase64'> }[],
+ * }} CoreEvalMaterialRecord
  */
 
 /**
@@ -40,9 +49,10 @@ import {
  *   pathResolve: (path: string) => string,
  * }} endowments
  * @param {{
- *   getBundlerMaker: () => Promise<import('./getBundlerMaker.js').BundleMaker>,
- *   getBundleSpec: (bundle: Promise<BundleSourceResult<'endoZipBase64'>>, getBundle: () => import('./getBundlerMaker.js').Bundler, opts?: any) => Promise<ManifestBundleRef>,
+ *   getBundlerMaker: () => Promise<BundleMaker>,
+ *   getBundleSpec: (bundle: Promise<BundleSourceResult<'endoZipBase64'>>, getBundle: () => Bundler, opts?: any) => Promise<ManifestBundleRef>,
  *   log?: typeof console.log,
+ *   onWriteCoreEval?: (record: CoreEvalMaterialRecord) => void | Promise<void>,
  *   writeFile?: typeof fs.promises.writeFile
  * }} io
  * @returns {WriteCoreEval}
@@ -54,13 +64,14 @@ export const makeWriteCoreEval = (
     getBundlerMaker,
     getBundleSpec,
     log = console.log,
+    onWriteCoreEval = () => {},
     writeFile = fs.promises.writeFile,
   },
 ) => {
   const { bundleSource, pathResolve } = endowments;
 
   let bundlerCache;
-  /** @returns {import('./getBundlerMaker.js').Bundler} */
+  /** @returns {Bundler} */
   const getBundler = () => {
     if (!bundlerCache) {
       bundlerCache = E(getBundlerMaker()).makeBundler({
@@ -118,7 +129,8 @@ export const makeWriteCoreEval = (
       return ns.default;
     };
 
-    const bundles = [];
+    /** @type {CoreEvalMaterialRecord['bundles']} */
+    const bundleRecords = [];
 
     /**
      * Install an entrypoint.
@@ -134,9 +146,13 @@ export const makeWriteCoreEval = (
       // Serialise the installations.
       mutex = E.when(mutex, async () => {
         // console.log('installing', { filePrefix, entrypoint, bundlePath });
-        const spec = await getBundleSpec(bundle, getBundler, opts);
-        bundles.push({
+        const [spec, builtBundle] = await Promise.all([
+          getBundleSpec(bundle, getBundler, opts),
+          bundle,
+        ]);
+        bundleRecords.push({
           entrypoint,
+          bundle: builtBundle,
           ...spec,
         });
         return spec;
@@ -203,13 +219,21 @@ behavior;
       name: filePrefix,
       script: codeFile,
       permit: permitFile,
-      bundles,
+      bundles: bundleRecords.map(({ bundle: _bundle, ...spec }) => spec),
     };
 
     await writeFile(
       `${filePrefix}-plan.json`,
       `${JSON.stringify(plan, null, 2)}\n`,
     );
+    await onWriteCoreEval({
+      plan,
+      eval: {
+        json_permits: JSON.stringify(evalPermits, null, 2),
+        js_code: trimmed,
+      },
+      bundles: bundleRecords,
+    });
 
     log(`\
 You can now run a governance submission command like: