@agoric/swingset-vat 0.33.0-u19.2 → 0.33.0-u21.0

package/src/kernel/state/kernelKeeper.js

@@ -1,5 +1,6 @@
 import { Nat, isNat } from '@endo/nat';
 import { assert, Fail } from '@endo/errors';
+import { KERNEL_STATS_METRICS } from '@agoric/internal/src/metrics.js';
 import { naturalCompare } from '@agoric/internal/src/natural-sort.js';
 import { makeDummySlogger, noopConsole } from '../slogger.js';
 import {
@@ -25,7 +26,6 @@ import {
   makeUpgradeID,
 } from '../../lib/id.js';
 import { kdebug } from '../../lib/kdebug.js';
-import { KERNEL_STATS_METRICS } from '../metrics.js';
 import { makeKernelStats } from './stats.js';
 import {
   enumeratePrefixedKeys,
@@ -212,9 +212,8 @@ function insistMeterID(m) {
 export const getAllStaticVats = kvStore => {
   const result = [];
   const prefix = 'vat.name.';
-  for (const k of enumeratePrefixedKeys(kvStore, prefix)) {
-    const vatID = kvStore.get(k) || Fail`getNextKey ensures get`;
-    const name = k.slice(prefix.length);
+  for (const { key, suffix: name } of enumeratePrefixedKeys(kvStore, prefix)) {
+    const vatID = kvStore.get(key) || Fail`getNextKey ensures get`;
     result.push([name, vatID]);
   }
   return result;
@@ -718,17 +717,22 @@ export default function makeKernelKeeper(
     // We iterate through all ephemeral and virtual entries so the kernel
     // can ensure that they are abandoned by a vat being upgraded.
     const prefix = `${vatID}.c.`;
-    const ephStart = `${prefix}o+`;
-    const durStart = `${prefix}o+d`;
-    const virStart = `${prefix}o+v`;
+    const ephStart = `o+`;
+    const durStart = `o+d`;
+    const virStart = `o+v`;
     /** @type {[string, string?][]} */
     const ranges = [[ephStart, durStart], [virStart]];
     for (const range of ranges) {
-      for (const k of enumeratePrefixedKeys(kvStore, ...range)) {
-        const vref = k.slice(prefix.length);
+      const rangeSuffix = range[0];
+      const args = /** @type {typeof ranges[0]} */ (
+        /** @type {unknown} */ (range.map(s => `${prefix}${s}`))
+      );
+      const prefixedKeys = enumeratePrefixedKeys(kvStore, ...args);
+      for (const { key, suffix } of prefixedKeys) {
+        const vref = `${rangeSuffix}${suffix}`;
         // exclude the root object, which is replaced by upgrade
         if (vref !== 'o+0') {
-          const kref = kvStore.get(k);
+          const kref = kvStore.get(key);
           assert.typeof(kref, 'string');
           yield { kref, vref };
         }
@@ -1072,7 +1076,7 @@ export default function makeKernelKeeper(
 
     // first, scan for exported objects, which must be orphaned
     remaining = budget.exports ?? budget.default;
-    for (const k of enumeratePrefixedKeys(kvStore, exportPrefix)) {
+    for (const { key } of enumeratePrefixedKeys(kvStore, exportPrefix)) {
       // The void for an object exported by a vat will always be of the form
       // `o+NN`.  The '+' means that the vat exported the object (rather than
       // importing it) and therefore the object is owned by (i.e., within) the
@@ -1080,9 +1084,7 @@ export default function makeKernelKeeper(
       // begin with `vMM.c.o+`.  In addition to deleting the c-list entry, we
       // must also delete the corresponding kernel owner entry for the object,
       // since the object will no longer be accessible.
-      const vref = stripPrefix(clistPrefix, k);
-      assert(vref.startsWith('o+'), vref);
-      const kref = kvStore.get(k);
+      const kref = kvStore.get(key);
       // note: adds to maybeFreeKrefs, deletes c-list and .owner
       orphanKernelObject(kref, vatID);
       work.exports += 1;
@@ -1094,11 +1096,14 @@ export default function makeKernelKeeper(
 
     // then scan for imported objects, which must be decrefed
     remaining = budget.imports ?? budget.default;
-    for (const k of enumeratePrefixedKeys(kvStore, importPrefix)) {
+    for (const { key, suffix } of enumeratePrefixedKeys(
+      kvStore,
+      importPrefix,
+    )) {
       // abandoned imports: delete the clist entry as if the vat did a
       // drop+retire
-      const kref = kvStore.get(k) || Fail`getNextKey ensures get`;
-      const vref = stripPrefix(clistPrefix, k);
+      const kref = kvStore.get(key) || Fail`getNextKey ensures get`;
+      const vref = `o-${suffix}`;
       undertaker.deleteCListEntry(kref, vref);
       // that will also delete both db keys
       work.imports += 1;
@@ -1113,9 +1118,12 @@ export default function makeKernelKeeper(
     // kpids are still present in the dead vat's c-list. Clean those
     // up now.
     remaining = budget.promises ?? budget.default;
-    for (const k of enumeratePrefixedKeys(kvStore, promisePrefix)) {
-      const kref = kvStore.get(k) || Fail`getNextKey ensures get`;
-      const vref = stripPrefix(clistPrefix, k);
+    for (const { key, suffix } of enumeratePrefixedKeys(
+      kvStore,
+      promisePrefix,
+    )) {
+      const kref = kvStore.get(key) || Fail`getNextKey ensures get`;
+      const vref = `p${suffix}`;
       undertaker.deleteCListEntry(kref, vref);
       // that will also delete both db keys
       work.promises += 1;
@@ -1127,8 +1135,8 @@ export default function makeKernelKeeper(
 
     // now loop back through everything and delete it all
     remaining = budget.kv ?? budget.default;
-    for (const k of enumeratePrefixedKeys(kvStore, `${vatID}.`)) {
-      kvStore.delete(k);
+    for (const { key } of enumeratePrefixedKeys(kvStore, `${vatID}.`)) {
+      kvStore.delete(key);
       work.kv += 1;
       remaining -= 1;
       if (remaining <= 0) {
@@ -1167,11 +1175,11 @@ export default function makeKernelKeeper(
       kvStore.set(DYNAMIC_IDS_KEY, JSON.stringify(newDynamicVatIDs));
     } else {
       kdebug(`removing static vat ${vatID}`);
-      for (const k of enumeratePrefixedKeys(kvStore, 'vat.name.')) {
-        if (kvStore.get(k) === vatID) {
-          kvStore.delete(k);
+      const prefixedKeys = enumeratePrefixedKeys(kvStore, 'vat.name.');
+      for (const { key, suffix: name } of prefixedKeys) {
+        if (kvStore.get(key) === vatID) {
+          kvStore.delete(key);
           const VAT_NAMES_KEY = 'vat.names';
-          const name = k.slice('vat.name.'.length);
           const oldStaticVatNames = JSON.parse(getRequired(VAT_NAMES_KEY));
           const newStaticVatNames = oldStaticVatNames.filter(v => v !== name);
           kvStore.set(VAT_NAMES_KEY, JSON.stringify(newStaticVatNames));
@@ -1240,7 +1248,7 @@ export default function makeKernelKeeper(
   function* enumeratePromisesByDecider(vatID) {
     insistVatID(vatID);
     const promisePrefix = `${vatID}.c.p`;
-    for (const k of enumeratePrefixedKeys(kvStore, promisePrefix)) {
+    for (const { key } of enumeratePrefixedKeys(kvStore, promisePrefix)) {
       // The vpid for a promise imported or exported by a vat (and thus
       // potentially a promise for which the vat *might* be the decider) will
       // always be of the form `p+NN` or `p-NN`.  The corresponding vpid->kpid
@@ -1250,7 +1258,7 @@ export default function makeKernelKeeper(
       // whether the vat is the decider or not.  If it is, we add the promise
       // to the list of promises that must be rejected because the dead vat
       // will never be able to act upon them.
-      const kpid = getRequired(k);
+      const kpid = getRequired(key);
       const p = getKernelPromise(kpid);
       if (p.state === 'unresolved' && p.decider === vatID) {
         yield [kpid, p];
@@ -1449,9 +1457,9 @@ export default function makeKernelKeeper(
 
   function getDevices() {
     const result = [];
-    for (const k of enumeratePrefixedKeys(kvStore, 'device.name.')) {
-      const name = k.slice(12);
-      const deviceID = kvStore.get(k) || Fail`getNextKey ensures get`;
+    const prefixedKeys = enumeratePrefixedKeys(kvStore, 'device.name.');
+    for (const { key, suffix: name } of prefixedKeys) {
+      const deviceID = kvStore.get(key) || Fail`getNextKey ensures get`;
       result.push([name, deviceID]);
     }
     return result;

package/src/kernel/state/stats.js

@@ -70,10 +70,9 @@ export const makeKernelStats = kernelStatsMetrics => {
   Object.freeze(allStatsKeys);
 
   const pickStats = (stat, gauge = false) => {
-    assert(
-      kernelConsensusStats && kernelLocalStats,
-      'Kernel stats not initialized',
-    );
+    if (!kernelConsensusStats || !kernelLocalStats) {
+      throw Fail`Kernel stats not initialized`;
+    }
     const metricType = allStatsKeys[stat];
     if (gauge) {
       metricType === 'gauge' || Fail`Invalid kernel gauge stat ${stat}`;
@@ -116,7 +115,12 @@ export const makeKernelStats = kernelStatsMetrics => {
     kernelStats[downStat] += delta;
   };
 
-  /** @param {boolean | undefined} [consensusOnly] */
+  /**
+   * Return a fresh snapshot, with or without local stats.
+   *
+   * @param {boolean | undefined} [consensusOnly]
+   * @returns {Record<string, number>}
+   */
   const getStats = consensusOnly => {
     return {
       ...(consensusOnly ? {} : kernelLocalStats),
@@ -130,10 +134,9 @@ export const makeKernelStats = kernelStatsMetrics => {
   };
 
   const getSerializedStats = () => {
-    assert(
-      kernelConsensusStats && kernelLocalStats,
-      'Kernel stats not initialized',
-    );
+    if (!kernelConsensusStats || !kernelLocalStats) {
+      throw Fail`Kernel stats not initialized`;
+    }
 
     return {
       consensusStats: JSON.stringify(kernelConsensusStats),

package/src/kernel/state/storageHelper.js

@@ -2,6 +2,10 @@
 
 import { Fail } from '@endo/errors';
 
+/**
+ * @import {KVStore} from '@agoric/swing-store';
+ */
+
 /**
  * Iterate over keys with a given prefix, in lexicographic order,
  * excluding an exact match of the prefix.
@@ -9,7 +13,8 @@ import { Fail } from '@endo/errors';
  * @param {KVStore} kvStore
  * @param {string} prefix
  * @param {string} [exclusiveEnd]
- * @yields {string} the next key with the prefix that is not >= exclusiveEnd
+ * @yields {{key: string; suffix: string}} the next `key` with the prefix that is not >= exclusiveEnd
+ * and the `suffix` which is obtained by stripping the supplied prefix from the key
  */
 export function* enumeratePrefixedKeys(kvStore, prefix, exclusiveEnd) {
   /** @type {string | undefined} */
@@ -22,7 +27,7 @@ export function* enumeratePrefixedKeys(kvStore, prefix, exclusiveEnd) {
     if (exclusiveEnd && key >= exclusiveEnd) {
       break;
     }
-    yield key;
+    yield { key, suffix: key.slice(prefix.length) };
   }
 }
 harden(enumeratePrefixedKeys);

package/src/kernel/state/vatKeeper.js

@@ -761,11 +761,13 @@ export function makeVatKeeper(
   function dumpState() {
     const res = [];
     const prefix = `${vatID}.c.`;
-    for (const k of enumeratePrefixedKeys(kvStore, prefix)) {
-      const slot = k.slice(prefix.length);
+    for (const { key, suffix: slot } of enumeratePrefixedKeys(
+      kvStore,
+      prefix,
+    )) {
       if (!slot.startsWith('k')) {
         const vatSlot = slot;
-        const kernelSlot = kvStore.get(k) || Fail`getNextKey ensures get`;
+        const kernelSlot = kvStore.get(key) || Fail`getNextKey ensures get`;
         /** @type { [string, string, string] } */
         const item = [kernelSlot, vatID, vatSlot];
         res.push(item);

package/src/kernel/vat-warehouse.js

@@ -299,7 +299,10 @@ export function makeVatWarehouse({
    */
   async function replayTranscript(vatID, vatKeeper, manager) {
     const total = vatKeeper.transcriptSize();
-    kernelSlog.write({ type: 'start-replay', vatID, deliveries: total });
+    const finish = kernelSlog.startDuration(['start-replay', 'finish-replay'], {
+      vatID,
+      deliveries: total,
+    });
     let first = true;
     for await (const [deliveryNum, te] of vatKeeper.getTranscript()) {
       // if (deliveryNum % 100 === 0) {
@@ -326,7 +329,7 @@ export function makeVatWarehouse({
       finishSlog(status);
       sim.finishSimulation(); // will throw if syscalls did not match
     }
-    kernelSlog.write({ type: 'finish-replay', vatID });
+    finish({ deliveries: undefined });
   }
 
   /**
@@ -563,18 +566,20 @@ export function makeVatWarehouse({
 
   /**
    * Save a heap snapshot for the given vatID, if the snapshotInterval
-   * is satisified
+   * is satisfied or a lower explicit delivery count has been reached.
    *
    * @param {VatID} vatID
+   * @param {number} [minDeliveryCount]
    */
-  async function maybeSaveSnapshot(vatID) {
-    const recreate = true; // PANIC in the failure case
-    const { manager } = await ensureVatOnline(vatID, recreate);
-    if (!manager.makeSnapshot) {
-      return false; // worker cannot make snapshots
+  async function maybeSaveSnapshot(vatID, minDeliveryCount = snapshotInterval) {
+    kernelKeeper.vatIsAlive(vatID) || Fail`${q(vatID)}: not alive`;
+    const vatKeeper = kernelKeeper.provideVatKeeper(vatID);
+    const vatOptions = vatKeeper.getOptions();
+
+    if (!vatOptions.useTranscript) {
+      return false;
     }
 
-    const vatKeeper = kernelKeeper.provideVatKeeper(vatID);
     let reason;
 
     const hasSnapshot = !!vatKeeper.getSnapshotInfo();
@@ -583,15 +588,21 @@ export function makeVatWarehouse({
     if (!hasSnapshot && deliveriesInSpan >= snapshotInitial) {
       // begin snapshot after 'snapshotInitial' deliveries in an incarnation
       reason = { snapshotInitial };
-    } else if (deliveriesInSpan >= snapshotInterval) {
+    } else if (deliveriesInSpan >= minDeliveryCount) {
       // begin snapshot after 'snapshotInterval' deliveries in a span
-      reason = { snapshotInterval };
+      reason = { snapshotInterval: minDeliveryCount };
     }
     // console.log('maybeSaveSnapshot: reason:', reason);
     if (!reason) {
       return false; // not time to make a snapshot
     }
 
+    const recreate = true; // PANIC in the failure case
+    const { manager } = await ensureVatOnline(vatID, recreate);
+    if (!manager.makeSnapshot) {
+      return false; // worker cannot make snapshots
+    }
+
     // always do a bringOutYourDead just before a snapshot, to shake
     // loose as much garbage as we can, and to minimize the GC
     // sensitivity effects of the forced GC that snapshots perform

package/src/lib/capdata.js

@@ -1,24 +1,11 @@
-import { Fail } from '@endo/errors';
+import { krefOf, kunser } from '@agoric/kmarshal';
 import { passStyleOf } from '@endo/far';
-import { kunser, krefOf } from '@agoric/kmarshal';
 
 /**
- * Assert function to ensure that something expected to be a capdata object
- * actually is.  A capdata object should have a .body property that's a string
- * and a .slots property that's an array of strings.
- *
- * @param {any} capdata  The object to be tested
- * @throws {Error} if, upon inspection, the parameter does not satisfy the above
- *   criteria.
- * @returns {asserts capdata is import('@endo/marshal').CapData<string>}
+ * @import {CapData} from '@endo/marshal';
  */
-export function insistCapData(capdata) {
-  typeof capdata.body === 'string' ||
-    Fail`capdata has non-string .body ${capdata.body}`;
-  Array.isArray(capdata.slots) ||
-    Fail`capdata has non-Array slots ${capdata.slots}`;
-  // TODO check that the .slots array elements are actually strings
-}
+
+export { insistCapData } from '@agoric/swingset-liveslots/src/capdata.js';
 
 /**
  * Returns the slot of a presence if the provided capdata is composed

package/src/lib/message.js

@@ -1,6 +1,10 @@
 import { assert, Fail } from '@endo/errors';
 import { insistCapData } from './capdata.js';
 
+/**
+ * @import {VatSyscallObject, VatSyscallResult, VatDeliveryResult} from '@agoric/swingset-liveslots';
+ */
+
 /**
  * Assert function to ensure that something expected to be a message object
  * actually is.  A message object should have a .method property that's a

package/src/types-external.js

@@ -5,6 +5,7 @@ export {};
  * @import {ERef} from '@endo/far';
  * @import {Passable, RemotableObject} from '@endo/pass-style';
  * @import {LimitedConsole} from '@agoric/internal/src/js-utils.js';
+ * @import {SlogProps, SlogDurationProps} from './controller/controller.js';
  */
 
 /* This file defines types that part of the external API of swingset. That
@@ -12,19 +13,36 @@ export {};
  * with, like VatAdminService. */
 
 /**
- * @typedef {'getExport' | 'nestedEvaluate' | 'endoZipBase64'} BundleFormat
+ * @template T
+ * @typedef {'Device' & { __deviceType__: T }} Device
+ */
+
+/** @typedef {<T>(target: Device<T>) => T} DProxy (approximately) */
+
+/**
+ * @typedef {(extraProps?: SlogDurationProps) => void} FinishSlogDuration
  */
 
 /**
  * @typedef {import('@endo/marshal').CapData<string>} SwingSetCapData
  */
 
+// TODO move Bundle types into Endo
 /**
+ * @typedef {'getExport' | 'nestedEvaluate' | 'endoZipBase64'} BundleFormat
  * @typedef { { moduleFormat: 'getExport', source: string, sourceMap?: string } } GetExportBundle
  * @typedef { { moduleFormat: 'nestedEvaluate', source: string, sourceMap?: string } } NestedEvaluateBundle
- * @typedef { EndoZipBase64Bundle | GetExportBundle | NestedEvaluateBundle } Bundle
- *
+ * @typedef { { moduleFormat: 'test', [x: symbol]: Record<PropertyKey, unknown> } } TestBundle
+ * @typedef { EndoZipBase64Bundle | GetExportBundle | NestedEvaluateBundle | TestBundle} Bundle
+ */
+
+/**
  * @typedef { 'local' | 'node-subprocess' | 'xsnap' | 'xs-worker' } ManagerType
+ *   The type of worker for hosting a vat.
+ *   - **local**: a Compartment in the SwingSet Node.js process
+ *   - **node-subprocess**: a child process using the same Node.js executable
+ *      (`process.execPath`)
+ *   - **xsnap** or **xs-worker**: an {@link @agoric/xsnap! @agoric/xsnap} worker
  */
 
 /**
@@ -128,7 +146,9 @@ export {};
  * @typedef { Awaited<ReturnType<typeof import('@agoric/xsnap').xsnap>> } XSnap
  * @typedef { (dr: VatDeliveryResult) => void } SlogFinishDelivery
  * @typedef { (ksr: KernelSyscallResult, vsr: VatSyscallResult) => void } SlogFinishSyscall
- * @typedef { { write: ({}) => void,
+ * @typedef { { write: (obj: SlogProps) => void,
+ *              startDuration:     (labels: readonly [startLabel: string, endLabel: string],
+ *                                  startProps: SlogDurationProps) => FinishSlogDuration,
  *              provideVatSlogger: (vatID: string,
  *                                  dynamic?: boolean,
  *                                  description?: string,
@@ -382,7 +402,9 @@ export {};
  *
  * @typedef { { vatParameters?: object, upgradeMessage?: string } } VatUpgradeOptions
  * @typedef { { incarnationNumber: number } } VatUpgradeResults
- *
+ */
+
+/**
  * @callback ShutdownWithFailure
  * Called to shut something down because something went wrong, where the reason
  * is supposed to be an Error that describes what went wrong. Some valid
@@ -393,7 +415,9 @@ export {};
  *
  * @param {Error} reason
  * @returns {void}
- *
+ */
+
+/**
  * @typedef {object} VatAdminFacet
  * A powerful object corresponding with a vat
  * that can be used to upgrade it with new code or parameters,
@@ -411,8 +435,9 @@ export {};
  * in which the JS memory space is abandoned. The new image is launched with access to 'baggage'
  * and any durable storage reachable from it, and must fulfill all the obligations of the previous
  * incarnation.
- *
- *
+ */
+
+/**
  * @typedef {{ adminNode: Guarded<VatAdminFacet>, root: object }} CreateVatResults
  *
  * @typedef {object} VatAdminSvc
@@ -421,5 +446,4 @@ export {};
  * @property {(name: string) => ERef<BundleCap>} getNamedBundleCap
  * @property {(name: string) => ERef<BundleID>} getBundleIDByName
  * @property {(bundleCap: BundleCap, options?: DynamicVatOptions) => ERef<CreateVatResults>} createVat
- *
  */

package/src/vats/plugin-manager.js

@@ -6,8 +6,9 @@ import { Remotable } from '@endo/marshal';
 import { Far, E } from '@endo/far';
 
 /**
- * @template T
- * @typedef {T | PromiseLike<T>} ERef
+ * @import {ERef} from '@endo/far';
+ * @import {MapStore} from '@agoric/store';
+ * @import {Device, DProxy} from '@agoric/swingset-vat/src/types-external.js';
  */
 
 /** @type {{ onReset: (firstTime: Promise<boolean>) => void}} */
@@ -16,13 +17,6 @@ const DEFAULT_RESETTER = Far('resetter', { onReset: _ => {} });
 /** @type {{ walk: (pluginRootP: any) => any }} */
 const DEFAULT_WALKER = Far('walker', { walk: pluginRootP => pluginRootP });
 
-/**
- * @template T
- * @typedef {'Device' & { __deviceType__: T }} Device
- */
-
-/** @typedef {<T>(target: Device<T>) => T} DProxy (approximately) */
-
 /**
  * @callback LoadPlugin
  * @param {string} specifier

package/src/vats/timer/vat-timer.js

@@ -15,9 +15,11 @@ import { TimeMath } from '@agoric/time';
 
 /**
  * @import {LegacyWeakMap, WeakMapStore} from '@agoric/store';
- * @import {MapStore} from '@agoric/swingset-liveslots';
+ * @import {Baggage, MapStore} from '@agoric/swingset-liveslots';
  * @import {Passable, RemotableObject} from '@endo/pass-style';
  * @import {Key} from '@endo/patterns';
+ * @import {TimerDevice} from '../../devices/timer/device-timer.js';
+ * @import {DProxy} from '../../types-external.js';
  */
 
 // This consumes O(N) RAM only for outstanding promises, via wakeAt(),
@@ -237,9 +239,17 @@ const measureInterval = (start, interval, now) => {
   return { latest, next };
 };
 
+/**
+ * @param {{
+ *   D: DProxy;
+ * }} vatPowers
+ * @param {{}} _vatParameters
+ * @param {Baggage} baggage
+ */
 export const buildRootObject = (vatPowers, _vatParameters, baggage) => {
   const { D } = vatPowers;
 
+  /** @type {TimerDevice} */
   let timerDevice;
   const insistDevice = () => {
     assert(timerDevice, 'TimerService used before createTimerService()');
@@ -455,9 +465,6 @@ export const buildRootObject = (vatPowers, _vatParameters, baggage) => {
     },
   };
 
-  /**
-   * @returns { PromiseEvent }
-   */
   const makePromiseEvent = prepareKind(
     baggage,
     'promiseEvent',
@@ -948,7 +955,7 @@ export const buildRootObject = (vatPowers, _vatParameters, baggage) => {
    * device, but we don't prohibit it from being called again (to
    * replace the device), just in case that's useful someday
    *
-   * @param {unknown} timerNode
+   * @param {TimerDevice} timerNode
    * @returns {TimerService}
    */
   const createTimerService = timerNode => {

package/src/vats/vat-admin/vat-vat-admin.js

@@ -20,7 +20,7 @@ import {
 
 /**
  * @import {VatAdminRootDeviceNode} from '../../devices/vat-admin/device-vat-admin.js';
- * @import {DProxy} from'../plugin-manager.js';
+ * @import {DProxy} from'../../types-external.js';
  * @import {Baggage} from '@agoric/vat-data';
  */
 
@@ -49,7 +49,7 @@ export function buildRootObject(vatPowers, _vatParameters, baggage) {
   const pendingBundles = new Map();
   const pendingUpgrades = new Map(); // upgradeID -> Promise<UpgradeResults>
 
-  /** @type {import('../plugin-manager.js').Device<VatAdminRootDeviceNode>} */
+  /** @type {import('../../types-external.js').Device<VatAdminRootDeviceNode>} */
   let vatAdminDev;
 
   const runningVats = new Map(); // vatID -> [doneP, { resolve, reject }]

package/tools/manual-timer.js

@@ -8,7 +8,7 @@ import { buildRootObject } from '../src/vats/timer/vat-timer.js';
 /**
  * @import {Timestamp} from '@agoric/time'
  * @import {TimerService} from '@agoric/time'
- * @import {Waker} from '../src/devices/timer/device-timer.js'
+ * @import {TimerDevice, Waker} from '../src/devices/timer/device-timer.js'
  *
  * @typedef {object} ManualTimerCallbacks
  * @property {(newTime: bigint, msg?: string) => void} [advanceTo]
@@ -34,7 +34,7 @@ const setup = callbacks => {
     currentWakeup: undefined,
     currentHandler: undefined,
   };
-  const deviceMarker = harden({});
+  const deviceMarker = /** @type {TimerDevice} */ (harden({}));
   const timerDeviceFuncs = harden({
     getLastPolled: () => state.now,
     setWakeup: (when, handler) => {
@@ -54,6 +54,7 @@ const setup = callbacks => {
       state.currentHandler = undefined;
     },
   });
+  /** @type {any} */
   const D = node => {
     assert.equal(node, deviceMarker, 'fake D only supports devices.timer');
     return timerDeviceFuncs;

package/tools/run-utils.js

@@ -15,9 +15,10 @@ import { makeQueue } from '@endo/stream';
  */
 export const makeRunUtils = (controller, harness) => {
   const mutex = makeQueue();
+  mutex.put('dummy result'); // so the first `await mutex.get()` doesn't hang
+
   const logRunFailure = reason =>
     console.log('controller.run() failure', reason);
-  mutex.put(controller.run().catch(logRunFailure));
 
   /**
    * Wait for exclusive access to the controller, then before relinquishing that access,