correct -ambients filenames

packages/SwingSet/src/controller/initializeSwingset.js

@@ -17,8 +17,6 @@ import {
   makeXsnapBundleData,
 } from './bundle-handler.js';
 
-import '../types-ambient.js';
-
 /**
  * @import {BundleFormat} from '../types-external.js';
  * @import {SwingSetConfig} from '../types-external.js';

packages/SwingSet/src/kernel/deviceManager.js

@@ -2,8 +2,6 @@ import { assert, Fail } from '@endo/errors';
 import { makeDeviceSlots } from './deviceSlots.js';
 import { insistCapData } from '../lib/capdata.js';
 
-import '../types-ambient.js';
-
 /**
  * @import {DeviceInvocation} from '../types-external.js';
  * @import {DeviceInvocationResult} from '../types-external.js';

packages/SwingSet/src/kernel/vat-loader/manager-helper.js

@@ -1,5 +1,4 @@
 import { assert } from '@endo/errors';
-import '../../types-ambient.js';
 import {
   insistVatDeliveryResult,
   insistVatSyscallResult,

packages/SwingSet/src/supervisors/supervisor-helper.js

@@ -2,7 +2,6 @@ import {
   insistVatSyscallObject,
   insistVatSyscallResult,
 } from '../lib/message.js';
-import '../types-ambient.js';
 
 /**
  * @import {CapData} from '@endo/marshal';

packages/builders/scripts/testing/provokeBOYD.js

@@ -9,7 +9,6 @@
 import { makeTracer } from '@agoric/internal';
 import { E } from '@endo/far';
 
-/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
 /**
  * @import {Instance} from '@agoric/zoe/src/zoeService/utils.js';
  * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';

packages/builders/scripts/testing/restart-axelar-gmp.js

@@ -9,8 +9,6 @@ import {
 } from '@agoric/internal';
 import { E } from '@endo/far';
 
-/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
-
 const trace = makeTracer('StartAxelarGmp', true);
 
 /**

packages/builders/scripts/testing/restart-basic-flows.js

@@ -9,8 +9,6 @@ import {
 } from '@agoric/internal';
 import { E } from '@endo/far';
 
-/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
-
 const trace = makeTracer('RestartBasicFlows', true);
 
 /**

packages/builders/scripts/testing/restart-send-anywhere.js

@@ -9,8 +9,6 @@ import {
 } from '@agoric/internal';
 import { E } from '@endo/far';
 
-/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
-
 const trace = makeTracer('StartSA', true);
 
 /**

packages/builders/scripts/testing/restart-stakeAtom.js

@@ -6,8 +6,6 @@ import { deeplyFulfilledObject, makeTracer } from '@agoric/internal';
 import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
 import { E } from '@endo/far';
 
-/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
-
 const trace = makeTracer('RestartSA', true);
 
 /**

packages/builders/scripts/testing/restart-valueVow.js

@@ -5,7 +5,6 @@
 import { makeTracer } from '@agoric/internal';
 import { E } from '@endo/far';
 
-/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
 /**
  * @import {Instance} from '@agoric/zoe/src/zoeService/utils.js';
  * @import {start} from '@agoric/zoe/src/contracts/valueVow.contract.js';

packages/builders/scripts/testing/start-valueVow.js

@@ -5,7 +5,6 @@
 import { makeTracer } from '@agoric/internal';
 import { E } from '@endo/far';
 
-/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
 /**
  * @import {Installation} from '@agoric/zoe/src/zoeService/utils.js';
  * @import {start} from '@agoric/zoe/src/contracts/valueVow.contract.js';

packages/builders/scripts/testing/upgrade-send-anywhere.js

@@ -9,11 +9,11 @@ import {
 } from '@agoric/internal';
 import { E } from '@endo/far';
 
-/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
 /**
  * @import {Installation, Instance} from '@agoric/zoe/src/zoeService/utils.js';
  * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
  * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {BootstrapPowers} from '@agoric/vats';
  */
 
 const trace = makeTracer('UpgradeSA', true);

packages/client-utils/tsconfig.build.json

@@ -10,9 +10,6 @@
         "emitDeclarationOnly": false,
         "declaration": true,
         "declarationMap": true,
-        "target": "es2022",
-        "module": "es2022",
-        "moduleResolution": "bundler",
         "lib": [
             "es2022",
             "DOM"

packages/deploy-script-support/src/externalTypes.js

@@ -4,6 +4,10 @@ export {};
 
 /**
  * @import {NameHub} from '@agoric/vats';
+ * @import {ScratchPad} from '@agoric/internal/src/scratch.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
@@ -67,18 +71,18 @@ export {};
 
 /**
  * @typedef {{
- *   scratch: ERef<import('@agoric/internal/src/scratch.js').ScratchPad>,
+ *   scratch: ERef<ScratchPad>,
  * }} CommonHome
  */
 
 // 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>,

packages/governance/test/swingsetTests/contractGovernor/add-governedContract.js

@@ -5,8 +5,6 @@
  *     agoric run /path/to/$0 [<bootstrap powers produce key> [<label>]]
  */
 
-/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
-
 /* eslint-disable import/no-extraneous-dependencies */
 // dynamic import { makeHelpers } from '@agoric/deploy-script-support';
 // dynamic import { getSpecifier } from '@agoric/internal/src/module-utils.js';

packages/inter-protocol/src/index.js

@@ -1,5 +1,4 @@
 // @jessie-check
 /// <reference types="@agoric/internal/exported.js" />
-/// <reference types="@agoric/vats/src/core/types-ambient.js" />
 
 export { calculateCurrentDebt } from './interest-math.js';

packages/inter-protocol/src/interest.js

@@ -11,8 +11,8 @@ import { TimeMath } from '@agoric/time';
  * @import {RelativeTime} from '@agoric/time'
  * @import {AdminFacet, InvitationAmount, ZCFMint} from '@agoric/zoe';
  * @import {Ratio} from '@agoric/ertp';
- * @import {Calculate, CalculatorKit} from './vaultFactory/types-ambient.js';
- * @import {MintAndTransfer} from './vaultFactory/types-ambient.js';
+ * @import {Calculate, CalculatorKit} from './vaultFactory/types.js';
+ * @import {MintAndTransfer} from './vaultFactory/types.js';
  */
 
 export const SECONDS_PER_YEAR = 60n * 60n * 24n * 365n;

packages/inter-protocol/src/proposals/addAssetToVault.js

@@ -31,8 +31,8 @@ export * from './startPSM.js';
 
 /**
  * @import {EconomyBootstrapPowers} from './econ-behaviors.js'
- * @import {FullSchedule} from '../auction/scheduler.js';
  * @import {TimerService} from '@agoric/time';
+ * @import {BootstrapPowers} from '@agoric/vats';
  */
 
 /**

packages/inter-protocol/src/proposals/deploy-price-feeds.js

@@ -27,6 +27,7 @@ export const DEFAULT_CONTRACT_TERMS = {
  * @import {EconomyBootstrapPowers} from './econ-behaviors.js';
  * @import {ChainlinkConfig} from '@agoric/inter-protocol/src/price/fluxAggregatorKit.js';
  * @import {StartedInstanceKit} from '@agoric/zoe/src/zoeService/utils.js';
+ * @import {NamedVatPowers, PromiseSpaceOf} from '@agoric/vats';
  */
 /** @import {FluxStartFn} from '@agoric/inter-protocol/src/price/fluxAggregatorContract.js'; */
 

packages/inter-protocol/src/proposals/econ-behaviors.js

@@ -15,6 +15,12 @@ import { makeGovernedTerms as makeGovernedVFTerms } from '../vaultFactory/params
  * @import {StartedInstanceKit} from '@agoric/zoe/src/zoeService/utils.js';
  * @import {AdminFacet} from '@agoric/zoe';
  * @import {MapStore, SetStore} from '@agoric/store';
+ * @import {RelativeTime} from '@agoric/time';
+ * @import {WellKnownSpaces} from '@agoric/vats';
+ * @import {ChainBootstrapSpace} from '@agoric/vats';
+ * @import {PromiseSpaceOf} from '@agoric/vats';
+ * @import {CommitteeElectorateCreatorFacet} from '@agoric/governance/src/committee.js';
+ * @import {PeriodicFeeCollector} from '../feeDistributor.js';
  */
 
 // Duplicated from vaultFactory/types-ambient.js to solve a CI problem.

packages/inter-protocol/src/proposals/price-feed-proposal.js

@@ -16,6 +16,7 @@ import {
 /**
  * @import {ChainlinkConfig} from '@agoric/inter-protocol/src/price/fluxAggregatorKit.js';
  * @import {EconomyBootstrapPowers} from './econ-behaviors.js';
+ * @import {start} from '@agoric/inter-protocol/src/price/fluxAggregatorContract.js';
  */
 
 // backwards compatibility
@@ -96,7 +97,7 @@ export const ensureOracleBrands = async (
  *       contractTerms: ChainlinkConfig;
  *       IN_BRAND_NAME: string;
  *       OUT_BRAND_NAME: string;
- *       priceAggregatorRef: Installation;
+ *       priceAggregatorRef?: Installation;
  *     };
  *   };
  * }} config
@@ -172,9 +173,7 @@ export const createPriceFeed = async (
   /**
    * @type {[
    *   [Brand<'nat'>, Brand<'nat'>],
-   *   Installation<
-   *     typeof import('@agoric/inter-protocol/src/price/fluxAggregatorContract.js').start
-   *   >,
+   *   Installation<typeof start>,
    *   Timer,
    * ]}
    */

packages/inter-protocol/src/proposals/replace-scaledPriceAuthorities.js

@@ -4,6 +4,11 @@ import { E } from '@endo/far';
 import { startScaledPriceAuthority } from './addAssetToVault.js';
 import { scaledPriceFeedName } from './utils.js';
 
+/**
+ * @import {BootstrapPowers} from '@agoric/vats';
+ * @import {ChainBootstrapSpace} from '@agoric/vats';
+ */
+
 const trace = makeTracer('replaceScaledPA', true);
 
 /**

packages/inter-protocol/src/proposals/replaceElectorate.js

@@ -17,7 +17,10 @@ import {
 } from '@agoric/internal/src/lib-chainStorage.js';
 import { provideRetiredInstances, reserveThenDeposit } from './utils.js';
 
-/** @import {EconomyBootstrapPowers} from './econ-behaviors.js' */
+/**
+ * @import {EconomyBootstrapPowers} from './econ-behaviors.js'
+ * @import {PromiseSpaceOf} from '@agoric/vats';
+ */
 /** @import {EconCharterStartResult} from './econ-behaviors.js' */
 /** @import {CommitteeElectorateCreatorFacet} from '@agoric/governance/src/committee.js'; */
 

packages/inter-protocol/src/proposals/startPSM.js

@@ -28,6 +28,8 @@ import {
  * @import {BootstrapManifest} from '@agoric/vats/src/core/lib-boot.js'
  * @import {PSMKit} from './econ-behaviors.js';
  * @import {FeeMintAccess} from '@agoric/zoe';
+ * @import {WellKnownSpaces} from '@agoric/vats';
+ * @import {ChainStorageVatParams} from '@agoric/vats';
  */
 /** @import {MetricsNotification} from '../psm/psm.js' */
 /** @import {EconomyBootstrapPowers} from './econ-behaviors.js' */

packages/inter-protocol/src/proposals/upgrade-scaledPriceAuthorities.js

@@ -1,6 +1,11 @@
 import { makeTracer } from '@agoric/internal';
 import { E } from '@endo/far';
 
+/**
+ * @import {ChainBootstrapSpace} from '@agoric/vats';
+ * @import {StartedInstanceKit} from '@agoric/vats';
+ */
+
 const trace = makeTracer('upgradeScaledPA', true);
 
 /**

packages/inter-protocol/src/proposals/utils.js

@@ -8,7 +8,7 @@ import { makeScalarBigMapStore } from '@agoric/vat-data';
 /**
  * @import {CopyMap} from '@endo/patterns';
  * @import {MapStore, SetStore} from '@agoric/store';
- * @import {NameAdmin} from '@agoric/vats';
+ * @import {NameAdmin, Producer} from '@agoric/vats';
  * @import {ScratchPad} from '@agoric/internal/src/scratch.js';
  * @import {Bundle} from '@agoric/swingset-vat';
  */

packages/inter-protocol/src/proposals/withdraw-reserve-proposal.js

@@ -2,11 +2,16 @@ import { E } from '@endo/far';
 import { makeTracer } from '@agoric/internal/src/debug.js';
 import { reserveThenDeposit } from './utils.js';
 
+/**
+ * @import {BootstrapPowers} from '@agoric/vats';
+ * @import {start} from '../reserve/assetReserve.js';
+ */
+
 /**
  * @param {BootstrapPowers & {
  *   consume: {
  *     reserveKit: Promise<
- *       ReturnType<typeof import('../reserve/assetReserve.js').start>
+ *       ReturnType<typeof start>
  *     >;
  *   };
  * }} powers

packages/inter-protocol/src/vaultFactory/params.js

@@ -1,7 +1,6 @@
 // @jessie-check
 
 /// <reference types="@agoric/internal/exported.js" />
-/// <reference path="./types-ambient.js" />
 
 import {
   CONTRACT_ELECTORATE,
@@ -27,7 +26,7 @@ import { amountPattern, ratioPattern } from '../contractSupport.js';
  * @import {Baggage} from '@agoric/vat-data';
  * @import {Ratio} from '@agoric/ertp';
  * @import {AssetReservePublicFacet} from '../reserve/assetReserve.js';
- * @import {InterestTiming, VaultManagerParamValues} from './types-ambient.js';
+ * @import {InterestTiming, VaultManagerParamValues} from './types.js';
  */
 
 export const CHARGING_PERIOD_KEY = 'ChargingPeriod';

packages/inter-protocol/src/vaultFactory/prioritizedVaults.js

@@ -18,7 +18,7 @@ import {
  * @import {Vault} from './vault.js';
  * @import {NormalizedDebt} from './storeUtils.js';
  * @import {Ratio} from '@agoric/ertp';
- * @import {VaultId} from './types-ambient.js';
+ * @import {VaultId} from './types.js';
  */
 
 const trace = makeTracer('PVaults', true);

packages/inter-protocol/src/vaultFactory/storeUtils.js

@@ -8,7 +8,7 @@
 /**
  * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
  * @import {Ratio} from '@agoric/ertp';
- * @import {VaultId} from './types-ambient.js';
+ * @import {VaultId} from './types.js';
  */
 
 // XXX importing these that are declared to be used only for testing