diff --git a/.eslintrc.js b/.eslintrc.js
index 23c664dd..386d3f66 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 module.exports = {
-  extends: ['eslint-config-salesforce-typescript', 'eslint-config-salesforce-license'],
+  extends: ['eslint-config-salesforce-typescript', 'eslint-config-salesforce-license', 'plugin:sf-plugin/library'],
   // ignore eslint files in NUT test repos
   ignorePatterns: ['test/nuts/ebikes-lwc'],
 };
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 46c2db2f..75cc19be 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,6 +37,7 @@ jobs:
           - 'yarn test:nuts:tracking:forceignore'
           - 'yarn test:nuts:tracking:remote'
           - 'yarn test:nuts:tracking:lwc'
+          - 'yarn test:nuts:deb'
           - 'yarn mocha "test/nuts/trackingCommands/mpd-*.nut.ts" --slow 3000 --timeout 600000 --parallel'
     with:
       packageName: '@salesforce/source-tracking'
@@ -65,20 +66,3 @@ jobs:
       preSwapCommands: 'yarn upgrade @salesforce/source-deploy-retrieve@latest; npx yarn-deduplicate; yarn install'
       useCache: false
     secrets: inherit
-
-  xNuts-source-tracking:
-    needs: linux-unit-tests
-    uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
-    strategy:
-      fail-fast: false
-      matrix:
-        os: ['ubuntu-latest', 'windows-latest']
-        command:
-          - 'yarn test:nuts:tracking'
-          - 'yarn test:nuts:deb'
-    with:
-      packageName: '@salesforce/source-tracking'
-      externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
-      command: ${{matrix.command}}
-      os: ${{matrix.os}}
-    secrets: inherit
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2450dda..ff2de632 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,696 +1,498 @@
 ## [2.2.28](https://github.com/forcedotcom/source-tracking/compare/2.2.27...2.2.28) (2023-04-12)
 
-
 ### Bug Fixes
 
-* prevent warnings for picklistValue ([a75425d](https://github.com/forcedotcom/source-tracking/commit/a75425ddfc9d26d0f4858edb51b4f76fc7097897))
-
-
+- prevent warnings for picklistValue ([a75425d](https://github.com/forcedotcom/source-tracking/commit/a75425ddfc9d26d0f4858edb51b4f76fc7097897))
 
 ## [2.2.27](https://github.com/forcedotcom/source-tracking/compare/2.2.26...2.2.27) (2023-04-11)
 
-
 ### Bug Fixes
 
-* bump SDR and core libs ([32ba81e](https://github.com/forcedotcom/source-tracking/commit/32ba81e5cd768b35a977299879b24f60d42b9578))
-
-
+- bump SDR and core libs ([32ba81e](https://github.com/forcedotcom/source-tracking/commit/32ba81e5cd768b35a977299879b24f60d42b9578))
 
 ## [2.2.26](https://github.com/forcedotcom/source-tracking/compare/2.2.25...2.2.26) (2023-03-19)
 
-
 ### Bug Fixes
 
-* **deps:** bump graceful-fs from 4.2.10 to 4.2.11 ([09eef39](https://github.com/forcedotcom/source-tracking/commit/09eef392e331ebc7e5b8b25aa788686e51fc2c51))
-
-
+- **deps:** bump graceful-fs from 4.2.10 to 4.2.11 ([09eef39](https://github.com/forcedotcom/source-tracking/commit/09eef392e331ebc7e5b8b25aa788686e51fc2c51))
 
 ## [2.2.25](https://github.com/forcedotcom/source-tracking/compare/2.2.24...2.2.25) (2023-03-18)
 
-
 ### Bug Fixes
 
-* **deps:** bump @salesforce/source-deploy-retrieve from 7.11.3 to 7.12.0 ([bfc19df](https://github.com/forcedotcom/source-tracking/commit/bfc19df87f2dfc53be523612fce9c3e2c0739679))
-
-
+- **deps:** bump @salesforce/source-deploy-retrieve from 7.11.3 to 7.12.0 ([bfc19df](https://github.com/forcedotcom/source-tracking/commit/bfc19df87f2dfc53be523612fce9c3e2c0739679))
 
 ## [2.2.24](https://github.com/forcedotcom/source-tracking/compare/2.2.23...2.2.24) (2023-03-11)
 
-
 ### Bug Fixes
 
-* **deps:** bump @salesforce/source-deploy-retrieve from 7.10.1 to 7.11.3 ([80983da](https://github.com/forcedotcom/source-tracking/commit/80983da7151f06a967035ab2b33625666de8004a))
-
-
+- **deps:** bump @salesforce/source-deploy-retrieve from 7.10.1 to 7.11.3 ([80983da](https://github.com/forcedotcom/source-tracking/commit/80983da7151f06a967035ab2b33625666de8004a))
 
 ## [2.2.23](https://github.com/forcedotcom/source-tracking/compare/2.2.22...2.2.23) (2023-03-04)
 
-
 ### Bug Fixes
 
-* **deps:** bump @salesforce/core from 3.33.5 to 3.33.6 ([cca0242](https://github.com/forcedotcom/source-tracking/commit/cca0242f81fc5a4c5bd08dad8eabfeb7edb0c691))
-
-
+- **deps:** bump @salesforce/core from 3.33.5 to 3.33.6 ([cca0242](https://github.com/forcedotcom/source-tracking/commit/cca0242f81fc5a4c5bd08dad8eabfeb7edb0c691))
 
 ## [2.2.22](https://github.com/forcedotcom/source-tracking/compare/2.2.21...2.2.22) (2023-02-17)
 
-
 ### Bug Fixes
 
-* empty project path when pulling remote deletes ([cee0498](https://github.com/forcedotcom/source-tracking/commit/cee049898ecee4353253d0b29d76e7fd7876d18b))
-
-
+- empty project path when pulling remote deletes ([cee0498](https://github.com/forcedotcom/source-tracking/commit/cee049898ecee4353253d0b29d76e7fd7876d18b))
 
 ## [2.2.21](https://github.com/forcedotcom/source-tracking/compare/2.2.20...2.2.21) (2023-02-02)
 
-
 ### Bug Fixes
 
-* bump sdr ([9014c97](https://github.com/forcedotcom/source-tracking/commit/9014c97bf4c4f69cf92082f37edf4d1c1ea6761d))
-
-
+- bump sdr ([9014c97](https://github.com/forcedotcom/source-tracking/commit/9014c97bf4c4f69cf92082f37edf4d1c1ea6761d))
 
 ## [2.2.20](https://github.com/forcedotcom/source-tracking/compare/2.2.19...2.2.20) (2023-01-28)
 
-
 ### Bug Fixes
 
-* **deps:** bump @salesforce/core from 3.32.13 to 3.33.1 ([a3690db](https://github.com/forcedotcom/source-tracking/commit/a3690dbc1c1f50795447c1ac72c4b06f544cd1a5))
-
-
+- **deps:** bump @salesforce/core from 3.32.13 to 3.33.1 ([a3690db](https://github.com/forcedotcom/source-tracking/commit/a3690dbc1c1f50795447c1ac72c4b06f544cd1a5))
 
 ## [2.2.19](https://github.com/forcedotcom/source-tracking/compare/2.2.18...2.2.19) (2023-01-21)
 
-
 ### Bug Fixes
 
-* **deps:** bump @salesforce/source-deploy-retrieve from 7.7.3 to 7.7.5 ([0745319](https://github.com/forcedotcom/source-tracking/commit/074531952949363e32f1a2e742697bcf9537e378))
-
-
+- **deps:** bump @salesforce/source-deploy-retrieve from 7.7.3 to 7.7.5 ([0745319](https://github.com/forcedotcom/source-tracking/commit/074531952949363e32f1a2e742697bcf9537e378))
 
 ## [2.2.18](https://github.com/forcedotcom/source-tracking/compare/2.2.17...2.2.18) (2023-01-18)
 
-
 ### Bug Fixes
 
-* auth to devhub for nut ([3103759](https://github.com/forcedotcom/source-tracking/commit/31037595004be27bc361ad8233e153443e3e81eb))
-* filter for null/undefined ([7a66508](https://github.com/forcedotcom/source-tracking/commit/7a6650892aa28ffab507a97697af1ba48f11f236))
-* include deleted files in FileResponses for retrieves ([f9fcee1](https://github.com/forcedotcom/source-tracking/commit/f9fcee123c772f01a14d9f7545fe0a8649eee695))
-* update tests for strictNullChecks ([685b466](https://github.com/forcedotcom/source-tracking/commit/685b466d35134188a7623dedddb0af113ea7591a))
-
-
+- auth to devhub for nut ([3103759](https://github.com/forcedotcom/source-tracking/commit/31037595004be27bc361ad8233e153443e3e81eb))
+- filter for null/undefined ([7a66508](https://github.com/forcedotcom/source-tracking/commit/7a6650892aa28ffab507a97697af1ba48f11f236))
+- include deleted files in FileResponses for retrieves ([f9fcee1](https://github.com/forcedotcom/source-tracking/commit/f9fcee123c772f01a14d9f7545fe0a8649eee695))
+- update tests for strictNullChecks ([685b466](https://github.com/forcedotcom/source-tracking/commit/685b466d35134188a7623dedddb0af113ea7591a))
 
 ## [2.2.17](https://github.com/forcedotcom/source-tracking/compare/2.2.16...2.2.17) (2023-01-04)
 
-
 ### Bug Fixes
 
-* **deps:** bump json5 from 1.0.1 to 1.0.2 ([6030467](https://github.com/forcedotcom/source-tracking/commit/60304674980e351f6c279394d626af916688ea5d))
-
-
+- **deps:** bump json5 from 1.0.1 to 1.0.2 ([6030467](https://github.com/forcedotcom/source-tracking/commit/60304674980e351f6c279394d626af916688ea5d))
 
 ## [2.2.16](https://github.com/forcedotcom/source-tracking/compare/2.2.16-dev.3...2.2.16) (2023-01-03)
 
-
-
 ## [2.2.16-dev.3](https://github.com/forcedotcom/source-tracking/compare/2.2.16-dev.2...2.2.16-dev.3) (2022-12-28)
 
-
 ### Bug Fixes
 
-* better error message ([8e3d011](https://github.com/forcedotcom/source-tracking/commit/8e3d0110c1994fd9389c6896d1a1eef415d87462))
-
-
+- better error message ([8e3d011](https://github.com/forcedotcom/source-tracking/commit/8e3d0110c1994fd9389c6896d1a1eef415d87462))
 
 ## [2.2.16-dev.2](https://github.com/forcedotcom/source-tracking/compare/2.2.16-dev.1...2.2.16-dev.2) (2022-12-28)
 
-
 ### Bug Fixes
 
-* maxFileAdd env var ([060b821](https://github.com/forcedotcom/source-tracking/commit/060b821587ebc10a41919426617e70045ba6db65))
-
-
+- maxFileAdd env var ([060b821](https://github.com/forcedotcom/source-tracking/commit/060b821587ebc10a41919426617e70045ba6db65))
 
 ## [2.2.16-dev.1](https://github.com/forcedotcom/source-tracking/compare/2.2.15...2.2.16-dev.1) (2022-12-26)
 
-
 ### Bug Fixes
 
-* testing lowering maxFileAdd ([3032066](https://github.com/forcedotcom/source-tracking/commit/303206643bfa3ef5b6c48f18d4250f3462130da3))
-
-
+- testing lowering maxFileAdd ([3032066](https://github.com/forcedotcom/source-tracking/commit/303206643bfa3ef5b6c48f18d4250f3462130da3))
 
 ## [2.2.15](https://github.com/forcedotcom/source-tracking/compare/2.2.14...2.2.15) (2022-12-14)
 
-
 ### Bug Fixes
 
-* bump sdr and core ([#288](https://github.com/forcedotcom/source-tracking/issues/288)) ([621d927](https://github.com/forcedotcom/source-tracking/commit/621d9278d40f67f29bafd0c490f380cbd5cf1ec6))
-
-
+- bump sdr and core ([#288](https://github.com/forcedotcom/source-tracking/issues/288)) ([621d927](https://github.com/forcedotcom/source-tracking/commit/621d9278d40f67f29bafd0c490f380cbd5cf1ec6))
 
 ## [2.2.14](https://github.com/forcedotcom/source-tracking/compare/2.2.13...2.2.14) (2022-11-22)
 
-
 ### Bug Fixes
 
-* bump SDR ([039fcf6](https://github.com/forcedotcom/source-tracking/commit/039fcf67995d4b618ba49df4e72f7088f2affec8))
-* dedupe ([be02155](https://github.com/forcedotcom/source-tracking/commit/be02155c29950b902fe4eb6ea517b93a3c8279ae))
-* treat ExperienceBundles and StaticResources like bundles for partial delete ([cdac022](https://github.com/forcedotcom/source-tracking/commit/cdac0228fea5ec50d9261607bc829f375dc831bb))
-* use new SDR registry property supportsPartialDelete ([aaa6c38](https://github.com/forcedotcom/source-tracking/commit/aaa6c38d54f99ee1b1ccb740d757468deb445366))
-
-
+- bump SDR ([039fcf6](https://github.com/forcedotcom/source-tracking/commit/039fcf67995d4b618ba49df4e72f7088f2affec8))
+- dedupe ([be02155](https://github.com/forcedotcom/source-tracking/commit/be02155c29950b902fe4eb6ea517b93a3c8279ae))
+- treat ExperienceBundles and StaticResources like bundles for partial delete ([cdac022](https://github.com/forcedotcom/source-tracking/commit/cdac0228fea5ec50d9261607bc829f375dc831bb))
+- use new SDR registry property supportsPartialDelete ([aaa6c38](https://github.com/forcedotcom/source-tracking/commit/aaa6c38d54f99ee1b1ccb740d757468deb445366))
 
 ## [2.2.13](https://github.com/forcedotcom/source-tracking/compare/2.2.12...2.2.13) (2022-11-19)
 
-
 ### Bug Fixes
 
-* **deps:** bump @salesforce/source-deploy-retrieve from 7.5.8 to 7.5.9 ([80c5d3b](https://github.com/forcedotcom/source-tracking/commit/80c5d3b1919ae4e9c5268365b28a461bfbc3a679))
-
-
+- **deps:** bump @salesforce/source-deploy-retrieve from 7.5.8 to 7.5.9 ([80c5d3b](https://github.com/forcedotcom/source-tracking/commit/80c5d3b1919ae4e9c5268365b28a461bfbc3a679))
 
 ## [2.2.12](https://github.com/forcedotcom/source-tracking/compare/2.2.11...2.2.12) (2022-11-15)
 
-
 ### Bug Fixes
 
-* digitalExperience to isBundle check ([e6add91](https://github.com/forcedotcom/source-tracking/commit/e6add917370751aee4fd1b7bc4edb959882b8f43))
-
-
+- digitalExperience to isBundle check ([e6add91](https://github.com/forcedotcom/source-tracking/commit/e6add917370751aee4fd1b7bc4edb959882b8f43))
 
 ## [2.2.11](https://github.com/forcedotcom/source-tracking/compare/2.2.10...2.2.11) (2022-10-23)
 
-
 ### Bug Fixes
 
-* **deps:** bump @salesforce/core from 3.31.10 to 3.31.16 ([5a27a00](https://github.com/forcedotcom/source-tracking/commit/5a27a004adde124784d944fed3c5178dd3d305bf))
-
-
+- **deps:** bump @salesforce/core from 3.31.10 to 3.31.16 ([5a27a00](https://github.com/forcedotcom/source-tracking/commit/5a27a004adde124784d944fed3c5178dd3d305bf))
 
 ## [2.2.10](https://github.com/forcedotcom/source-tracking/compare/2.2.9...2.2.10) (2022-10-18)
 
-
 ### Bug Fixes
 
-* **deps:** major bump sdr ([#253](https://github.com/forcedotcom/source-tracking/issues/253)) ([8f7bff3](https://github.com/forcedotcom/source-tracking/commit/8f7bff31f49b678ba57c7759bc7b74f211ba8716))
-
-
+- **deps:** major bump sdr ([#253](https://github.com/forcedotcom/source-tracking/issues/253)) ([8f7bff3](https://github.com/forcedotcom/source-tracking/commit/8f7bff31f49b678ba57c7759bc7b74f211ba8716))
 
 ## [2.2.9](https://github.com/forcedotcom/source-tracking/compare/2.2.8...2.2.9) (2022-10-08)
 
-
 ### Bug Fixes
 
-* **deps:** bump @salesforce/source-deploy-retrieve from 6.8.2 to 6.9.0 ([97ae35e](https://github.com/forcedotcom/source-tracking/commit/97ae35eeb82cf3301eefb0536d578b4e62f6d498))
-
-
+- **deps:** bump @salesforce/source-deploy-retrieve from 6.8.2 to 6.9.0 ([97ae35e](https://github.com/forcedotcom/source-tracking/commit/97ae35eeb82cf3301eefb0536d578b4e62f6d498))
 
 ## [2.2.8](https://github.com/forcedotcom/source-tracking/compare/2.2.7...2.2.8) (2022-10-05)
 
-
 ### Bug Fixes
 
-* poll for CustomObjectTranslation, but still not CustomObjects ([ce7c79d](https://github.com/forcedotcom/source-tracking/commit/ce7c79df930e5c4c12fda2f93e7f17db67183f43))
-
-
+- poll for CustomObjectTranslation, but still not CustomObjects ([ce7c79d](https://github.com/forcedotcom/source-tracking/commit/ce7c79df930e5c4c12fda2f93e7f17db67183f43))
 
 ## [2.2.7](https://github.com/forcedotcom/source-tracking/compare/2.2.6...2.2.7) (2022-09-30)
 
-
 ### Bug Fixes
 
-* **deps:** bump @salesforce/source-deploy-retrieve from 6.8.1 to 6.8.2 ([8a3efc3](https://github.com/forcedotcom/source-tracking/commit/8a3efc30b33d6ca076e2273c13726a21dd7225e3))
-
-
+- **deps:** bump @salesforce/source-deploy-retrieve from 6.8.1 to 6.8.2 ([8a3efc3](https://github.com/forcedotcom/source-tracking/commit/8a3efc30b33d6ca076e2273c13726a21dd7225e3))
 
 ## [2.2.6](https://github.com/forcedotcom/source-tracking/compare/2.2.5...2.2.6) (2022-09-30)
 
-
 ### Bug Fixes
 
-* **deps:** bump @salesforce/core from 3.30.8 to 3.30.9 ([5619491](https://github.com/forcedotcom/source-tracking/commit/561949136d4bf8a9dd38f3bba7a64c32ffff40d5))
-
-
+- **deps:** bump @salesforce/core from 3.30.8 to 3.30.9 ([5619491](https://github.com/forcedotcom/source-tracking/commit/561949136d4bf8a9dd38f3bba7a64c32ffff40d5))
 
 ## [2.2.5](https://github.com/forcedotcom/source-tracking/compare/2.2.4...2.2.5) (2022-09-29)
 
-
 ### Bug Fixes
 
-* **deps:** bump vm2 from 3.9.10 to 3.9.11 ([ff9ddcd](https://github.com/forcedotcom/source-tracking/commit/ff9ddcdfa3ae7c20b2523a2d0f2ef419d953e736))
-
-
+- **deps:** bump vm2 from 3.9.10 to 3.9.11 ([ff9ddcd](https://github.com/forcedotcom/source-tracking/commit/ff9ddcdfa3ae7c20b2523a2d0f2ef419d953e736))
 
 ## [2.2.4](https://github.com/forcedotcom/source-tracking/compare/v2.2.3...2.2.4) (2022-09-25)
 
-
 ### Bug Fixes
 
-* **deps:** bump @salesforce/source-deploy-retrieve from 6.8.0 to 6.8.1 ([8c28a5e](https://github.com/forcedotcom/source-tracking/commit/8c28a5e1194321668ca22a439cf4547b9f63a414))
-
-
+- **deps:** bump @salesforce/source-deploy-retrieve from 6.8.0 to 6.8.1 ([8c28a5e](https://github.com/forcedotcom/source-tracking/commit/8c28a5e1194321668ca22a439cf4547b9f63a414))
 
 ## [2.2.3](https://github.com/forcedotcom/source-tracking/compare/v2.2.2...v2.2.3) (2022-09-13)
 
-
 ### Bug Fixes
 
-* ignore DEB, DigitalExperience and DEC from source tracking tracking ([#206](https://github.com/forcedotcom/source-tracking/issues/206)) ([3e4b985](https://github.com/forcedotcom/source-tracking/commit/3e4b985f2c805d969a88a60171aab49f1d0032fb))
-
-
+- ignore DEB, DigitalExperience and DEC from source tracking tracking ([#206](https://github.com/forcedotcom/source-tracking/issues/206)) ([3e4b985](https://github.com/forcedotcom/source-tracking/commit/3e4b985f2c805d969a88a60171aab49f1d0032fb))
 
 ## [2.2.2](https://github.com/forcedotcom/source-tracking/compare/v2.2.1...v2.2.2) (2022-08-10)
 
-
 ### Bug Fixes
 
-* bump eslint/jsdoc to get automerges flowing again ([afd85ff](https://github.com/forcedotcom/source-tracking/commit/afd85ff420877b7fb969085cf5f59d9c3f80555f))
-* ensure remote changes have a value for ignored (plugin expects it) ([bc1379f](https://github.com/forcedotcom/source-tracking/commit/bc1379f8f020fed5bfca721330f4404662d1b300))
-* force version change ([5483cd3](https://github.com/forcedotcom/source-tracking/commit/5483cd317614aea6aeb50c5544cede92fa9c2cb2))
-* remote changes display ignoredness ([d3533f9](https://github.com/forcedotcom/source-tracking/commit/d3533f9275d2a290b3c34019e204718e16ceaa75))
-
+- bump eslint/jsdoc to get automerges flowing again ([afd85ff](https://github.com/forcedotcom/source-tracking/commit/afd85ff420877b7fb969085cf5f59d9c3f80555f))
+- ensure remote changes have a value for ignored (plugin expects it) ([bc1379f](https://github.com/forcedotcom/source-tracking/commit/bc1379f8f020fed5bfca721330f4404662d1b300))
+- force version change ([5483cd3](https://github.com/forcedotcom/source-tracking/commit/5483cd317614aea6aeb50c5544cede92fa9c2cb2))
+- remote changes display ignoredness ([d3533f9](https://github.com/forcedotcom/source-tracking/commit/d3533f9275d2a290b3c34019e204718e16ceaa75))
 
 ### Features
 
-* local CmpSet from changes tracks ignored files like normal CmpSet ([aaa707f](https://github.com/forcedotcom/source-tracking/commit/aaa707fb2e68f5b7199d79d8ea8213068bea09b1))
-* overload to preserve backwards compatibility ([cfc53e3](https://github.com/forcedotcom/source-tracking/commit/cfc53e3ecf0b037cbe7c7ada2588c2e4ead2ab88))
-
-
+- local CmpSet from changes tracks ignored files like normal CmpSet ([aaa707f](https://github.com/forcedotcom/source-tracking/commit/aaa707fb2e68f5b7199d79d8ea8213068bea09b1))
+- overload to preserve backwards compatibility ([cfc53e3](https://github.com/forcedotcom/source-tracking/commit/cfc53e3ecf0b037cbe7c7ada2588c2e4ead2ab88))
 
 ## [2.2.1](https://github.com/forcedotcom/source-tracking/compare/v2.2.0...v2.2.1) (2022-07-05)
 
-
 ### Bug Fixes
 
-* bump core ([#180](https://github.com/forcedotcom/source-tracking/issues/180)) ([bf0c1f7](https://github.com/forcedotcom/source-tracking/commit/bf0c1f71f91701dacd2516914ab2abca33b1d00a))
-
-
+- bump core ([#180](https://github.com/forcedotcom/source-tracking/issues/180)) ([bf0c1f7](https://github.com/forcedotcom/source-tracking/commit/bf0c1f71f91701dacd2516914ab2abca33b1d00a))
 
 # [2.2.0](https://github.com/forcedotcom/source-tracking/compare/v2.1.2...v2.2.0) (2022-06-29)
 
-
 ### Bug Fixes
 
-* async lifecycle subscribe ([75031f3](https://github.com/forcedotcom/source-tracking/commit/75031f3bbe753001a42f7abcfec1415bfb62547e))
-* custom field was not polling correctly (logic error on del__c) ([1ff2341](https://github.com/forcedotcom/source-tracking/commit/1ff23419d737cb2a22bcf070f5b2790b9ef0536d))
-* logic on local ignored ([9667a6e](https://github.com/forcedotcom/source-tracking/commit/9667a6e8b442a6df0a42fd42dde4dfc289928f90))
-* use fixed jsforce autoFetch, restore ut ([0b32d21](https://github.com/forcedotcom/source-tracking/commit/0b32d217013a346ef8826d3820566b7d70dba3c1))
-
+- async lifecycle subscribe ([75031f3](https://github.com/forcedotcom/source-tracking/commit/75031f3bbe753001a42f7abcfec1415bfb62547e))
+- custom field was not polling correctly (logic error on del\_\_c) ([1ff2341](https://github.com/forcedotcom/source-tracking/commit/1ff23419d737cb2a22bcf070f5b2790b9ef0536d))
+- logic on local ignored ([9667a6e](https://github.com/forcedotcom/source-tracking/commit/9667a6e8b442a6df0a42fd42dde4dfc289928f90))
+- use fixed jsforce autoFetch, restore ut ([0b32d21](https://github.com/forcedotcom/source-tracking/commit/0b32d217013a346ef8826d3820566b7d70dba3c1))
 
 ### Features
 
-* event subscription and convenience method for push ([0c2135b](https://github.com/forcedotcom/source-tracking/commit/0c2135ba3076d3d7a3efd1e4d3c41a468e349728))
-* local repo cache breaking for get status, and a generic method ([6645b72](https://github.com/forcedotcom/source-tracking/commit/6645b72c4695a15caca8aa6d3dc158a600fd15de))
-* never track utam ([6e71f03](https://github.com/forcedotcom/source-tracking/commit/6e71f031c27c4e690d8538253b751da13da0b6e3))
-* option to use SDR events ([d86f698](https://github.com/forcedotcom/source-tracking/commit/d86f69896185b68af7e489f6026589957e06f29d))
-* top-level cache config of local cache behavior ([236ac28](https://github.com/forcedotcom/source-tracking/commit/236ac28314b45c42eff83b9ab8003d0c39efbbb0))
-* track based on sdr events ([1238a68](https://github.com/forcedotcom/source-tracking/commit/1238a686f1d2c6091154ac6370c3d3d019c3a7a7))
-
+- event subscription and convenience method for push ([0c2135b](https://github.com/forcedotcom/source-tracking/commit/0c2135ba3076d3d7a3efd1e4d3c41a468e349728))
+- local repo cache breaking for get status, and a generic method ([6645b72](https://github.com/forcedotcom/source-tracking/commit/6645b72c4695a15caca8aa6d3dc158a600fd15de))
+- never track utam ([6e71f03](https://github.com/forcedotcom/source-tracking/commit/6e71f031c27c4e690d8538253b751da13da0b6e3))
+- option to use SDR events ([d86f698](https://github.com/forcedotcom/source-tracking/commit/d86f69896185b68af7e489f6026589957e06f29d))
+- top-level cache config of local cache behavior ([236ac28](https://github.com/forcedotcom/source-tracking/commit/236ac28314b45c42eff83b9ab8003d0c39efbbb0))
+- track based on sdr events ([1238a68](https://github.com/forcedotcom/source-tracking/commit/1238a686f1d2c6091154ac6370c3d3d019c3a7a7))
 
 ### Performance Improvements
 
-* some more things not to poll for based on telemetry ([10f6fa3](https://github.com/forcedotcom/source-tracking/commit/10f6fa3e0324ffae0e03101b5bcf452793730d35))
-
-
+- some more things not to poll for based on telemetry ([10f6fa3](https://github.com/forcedotcom/source-tracking/commit/10f6fa3e0324ffae0e03101b5bcf452793730d35))
 
 ## [2.1.2](https://github.com/forcedotcom/source-tracking/compare/v2.1.1...v2.1.2) (2022-06-23)
 
-
 ### Bug Fixes
 
-* bump core for autofetch ([3567c69](https://github.com/forcedotcom/source-tracking/commit/3567c69dd49444ef757b9699bb676a0a1a25561c))
-
-
+- bump core for autofetch ([3567c69](https://github.com/forcedotcom/source-tracking/commit/3567c69dd49444ef757b9699bb676a0a1a25561c))
 
 ## [2.1.1](https://github.com/forcedotcom/source-tracking/compare/v2.1.0...v2.1.1) (2022-06-22)
 
-
 ### Bug Fixes
 
-* core for jsforce autofetch ([406c519](https://github.com/forcedotcom/source-tracking/commit/406c519827571fc8f9be2e8008b1cdd8b7827634))
-
-
+- core for jsforce autofetch ([406c519](https://github.com/forcedotcom/source-tracking/commit/406c519827571fc8f9be2e8008b1cdd8b7827634))
 
 # [2.1.0](https://github.com/forcedotcom/source-tracking/compare/v2.0.0...v2.1.0) (2022-06-22)
 
-
 ### Bug Fixes
 
-* use await ([ce650bd](https://github.com/forcedotcom/source-tracking/commit/ce650bdc9d18a96adb1b0959c44c4e42eb972e2b))
-* use fixed jsforce autoFetch, restore ut ([f52afd0](https://github.com/forcedotcom/source-tracking/commit/f52afd055d05c6c577e864b1d78edf2acebaab46))
-* wait for query to finish ([4e4ac4b](https://github.com/forcedotcom/source-tracking/commit/4e4ac4b9e3a6a480e8ddb9419cecde7304db76c3))
-
+- use await ([ce650bd](https://github.com/forcedotcom/source-tracking/commit/ce650bdc9d18a96adb1b0959c44c4e42eb972e2b))
+- use fixed jsforce autoFetch, restore ut ([f52afd0](https://github.com/forcedotcom/source-tracking/commit/f52afd055d05c6c577e864b1d78edf2acebaab46))
+- wait for query to finish ([4e4ac4b](https://github.com/forcedotcom/source-tracking/commit/4e4ac4b9e3a6a480e8ddb9419cecde7304db76c3))
 
 ### Features
 
-* use StateAggregator ([8a29ac6](https://github.com/forcedotcom/source-tracking/commit/8a29ac6cc7d4009cac32bd86ce55e82104991d95))
-
-
+- use StateAggregator ([8a29ac6](https://github.com/forcedotcom/source-tracking/commit/8a29ac6cc7d4009cac32bd86ce55e82104991d95))
 
 # [2.0.0](https://github.com/forcedotcom/source-tracking/compare/v1.5.0...v2.0.0) (2022-05-23)
 
-
 ### Features
 
-* corev3, jsforce2 ([0c0b1cf](https://github.com/forcedotcom/source-tracking/commit/0c0b1cf377245e61d83397fcf39baf7de6c06e76))
-* support both .sfdx/.sf ([3d52e66](https://github.com/forcedotcom/source-tracking/commit/3d52e66b2228c7c6721e97d780d8b56a30cb0496))
-* use new org feature to determine tracking ([0299bfb](https://github.com/forcedotcom/source-tracking/commit/0299bfb9b49122c5e2ff9748038e10a129b26829))
-* use v3 error/messages ([41676ff](https://github.com/forcedotcom/source-tracking/commit/41676ff2d23c6bba91e807d8be152558ad849e30))
-* use v3 error/messages ([488fbfa](https://github.com/forcedotcom/source-tracking/commit/488fbfabbeedb113566b9c67201da4245338b2b6))
-
-
+- corev3, jsforce2 ([0c0b1cf](https://github.com/forcedotcom/source-tracking/commit/0c0b1cf377245e61d83397fcf39baf7de6c06e76))
+- support both .sfdx/.sf ([3d52e66](https://github.com/forcedotcom/source-tracking/commit/3d52e66b2228c7c6721e97d780d8b56a30cb0496))
+- use new org feature to determine tracking ([0299bfb](https://github.com/forcedotcom/source-tracking/commit/0299bfb9b49122c5e2ff9748038e10a129b26829))
+- use v3 error/messages ([41676ff](https://github.com/forcedotcom/source-tracking/commit/41676ff2d23c6bba91e807d8be152558ad849e30))
+- use v3 error/messages ([488fbfa](https://github.com/forcedotcom/source-tracking/commit/488fbfabbeedb113566b9c67201da4245338b2b6))
 
 # [1.5.0](https://github.com/forcedotcom/source-tracking/compare/v1.4.2...v1.5.0) (2022-05-04)
 
-
 ### Bug Fixes
 
-* 2 more types ([c5554f1](https://github.com/forcedotcom/source-tracking/commit/c5554f18c21283c85589ab0ea1c9e632be1bbeaf))
-
+- 2 more types ([c5554f1](https://github.com/forcedotcom/source-tracking/commit/c5554f18c21283c85589ab0ea1c9e632be1bbeaf))
 
 ### Features
 
-* polling optimizations ([e39afd4](https://github.com/forcedotcom/source-tracking/commit/e39afd409ffa321ac7cf91aab3f850dea5dcb45e))
-
-
+- polling optimizations ([e39afd4](https://github.com/forcedotcom/source-tracking/commit/e39afd409ffa321ac7cf91aab3f850dea5dcb45e))
 
 ## [1.4.2](https://github.com/forcedotcom/source-tracking/compare/v1.4.1...v1.4.2) (2022-04-29)
 
-
 ### Bug Fixes
 
-* use absolute paths in ComponentSet for matching local source ([#153](https://github.com/forcedotcom/source-tracking/issues/153)) ([b5690a5](https://github.com/forcedotcom/source-tracking/commit/b5690a5c4f3a3fe02f733fa1578467e2278e62bf))
-
-
+- use absolute paths in ComponentSet for matching local source ([#153](https://github.com/forcedotcom/source-tracking/issues/153)) ([b5690a5](https://github.com/forcedotcom/source-tracking/commit/b5690a5c4f3a3fe02f733fa1578467e2278e62bf))
 
 ## [1.4.1](https://github.com/forcedotcom/source-tracking/compare/v1.4.0...v1.4.1) (2022-04-28)
 
-
-
 # [1.4.0](https://github.com/forcedotcom/source-tracking/compare/v1.3.1...v1.4.0) (2022-04-27)
 
-
 ### Features
 
-* comp set for pulls ([4b361a4](https://github.com/forcedotcom/source-tracking/commit/4b361a4f31ac4f810762ee8d6f8447f7eef1be31))
-
-
+- comp set for pulls ([4b361a4](https://github.com/forcedotcom/source-tracking/commit/4b361a4f31ac4f810762ee8d6f8447f7eef1be31))
 
 ## [1.3.1](https://github.com/forcedotcom/source-tracking/compare/v1.3.0...v1.3.1) (2022-03-25)
 
-
 ### Bug Fixes
 
-* tracking really large repos in chunks, lower limit for windows  ([0cb2ce5](https://github.com/forcedotcom/source-tracking/commit/0cb2ce5f3b65b8be9f4e4210aba010e919f692a3))
-
-
+- tracking really large repos in chunks, lower limit for windows ([0cb2ce5](https://github.com/forcedotcom/source-tracking/commit/0cb2ce5f3b65b8be9f4e4210aba010e919f692a3))
 
 # [1.3.0](https://github.com/forcedotcom/source-tracking/compare/v1.2.0...v1.3.0) (2022-03-25)
 
-
 ### Features
 
-* gracful-fs for EMFILE: too many open files ([1573828](https://github.com/forcedotcom/source-tracking/commit/1573828f5b3cf5f4f8b2023ff31b5764214d4b06))
-
-
+- gracful-fs for EMFILE: too many open files ([1573828](https://github.com/forcedotcom/source-tracking/commit/1573828f5b3cf5f4f8b2023ff31b5764214d4b06))
 
 # [1.2.0](https://github.com/forcedotcom/source-tracking/compare/v1.1.7...v1.2.0) (2022-03-23)
 
-
 ### Bug Fixes
 
-* ga tracking commands compatibility ([3a31a0d](https://github.com/forcedotcom/source-tracking/commit/3a31a0de448993c643ea4661a7a37772e46e8f51))
-* support pkgDir with ./foo ([3b46454](https://github.com/forcedotcom/source-tracking/commit/3b46454b3e57f653cbe80c66fbfee1cac121c2a8))
-
+- ga tracking commands compatibility ([3a31a0d](https://github.com/forcedotcom/source-tracking/commit/3a31a0de448993c643ea4661a7a37772e46e8f51))
+- support pkgDir with ./foo ([3b46454](https://github.com/forcedotcom/source-tracking/commit/3b46454b3e57f653cbe80c66fbfee1cac121c2a8))
 
 ### Features
 
-* let  isogit deal with ignore files ([#135](https://github.com/forcedotcom/source-tracking/issues/135)) ([1ddb2cd](https://github.com/forcedotcom/source-tracking/commit/1ddb2cdb8f23688f7bb4876a893097a85581f4c1))
-
-
+- let isogit deal with ignore files ([#135](https://github.com/forcedotcom/source-tracking/issues/135)) ([1ddb2cd](https://github.com/forcedotcom/source-tracking/commit/1ddb2cdb8f23688f7bb4876a893097a85581f4c1))
 
 ## [1.1.7](https://github.com/forcedotcom/source-tracking/compare/v1.1.6...v1.1.7) (2022-03-16)
 
-
 ### Bug Fixes
 
-* use isogit multiple add ([0845df8](https://github.com/forcedotcom/source-tracking/commit/0845df81845f07bd2bece444118497b2ef72e7aa))
-
+- use isogit multiple add ([0845df8](https://github.com/forcedotcom/source-tracking/commit/0845df81845f07bd2bece444118497b2ef72e7aa))
 
 ### Performance Improvements
 
-* use improved iso-git multiple-add API ([65bd3d4](https://github.com/forcedotcom/source-tracking/commit/65bd3d4770a16cecc528e5d205cdba7e83032741))
-
-
+- use improved iso-git multiple-add API ([65bd3d4](https://github.com/forcedotcom/source-tracking/commit/65bd3d4770a16cecc528e5d205cdba7e83032741))
 
 ## [1.1.6](https://github.com/forcedotcom/source-tracking/compare/v1.1.5...v1.1.6) (2022-03-14)
 
-
 ### Performance Improvements
 
-* deduplicate files as they are commited to shadow repo ([#133](https://github.com/forcedotcom/source-tracking/issues/133)) ([fbc6d33](https://github.com/forcedotcom/source-tracking/commit/fbc6d33fb363b514ddeee21bea539df465a5a3fc))
-
-
+- deduplicate files as they are commited to shadow repo ([#133](https://github.com/forcedotcom/source-tracking/issues/133)) ([fbc6d33](https://github.com/forcedotcom/source-tracking/commit/fbc6d33fb363b514ddeee21bea539df465a5a3fc))
 
 ## [1.1.5](https://github.com/forcedotcom/source-tracking/compare/v1.1.4...v1.1.5) (2022-03-11)
 
-
-
 ## [1.1.4](https://github.com/forcedotcom/source-tracking/compare/v1.1.3...v1.1.4) (2022-03-07)
 
-
 ### Bug Fixes
 
-* clearer messaging and legacy accommodation ([9f14e0f](https://github.com/forcedotcom/source-tracking/commit/9f14e0f02c9df69018b396148b8b4c49c161bf4d))
-
-
+- clearer messaging and legacy accommodation ([9f14e0f](https://github.com/forcedotcom/source-tracking/commit/9f14e0f02c9df69018b396148b8b4c49c161bf4d))
 
 ## [1.1.3](https://github.com/forcedotcom/source-tracking/compare/v1.1.2...v1.1.3) (2022-03-07)
 
-
 ### Bug Fixes
 
-* revert beta/legacy mapping ([4d3380c](https://github.com/forcedotcom/source-tracking/commit/4d3380c74a72572a8c1e464c739c4d5b8af69442))
-
-
+- revert beta/legacy mapping ([4d3380c](https://github.com/forcedotcom/source-tracking/commit/4d3380c74a72572a8c1e464c739c4d5b8af69442))
 
 ## [1.1.2](https://github.com/forcedotcom/source-tracking/compare/v1.1.1...v1.1.2) (2022-03-02)
 
-
 ### Bug Fixes
 
-* more metadata polling exclusions based on telemetry ([ae5adf3](https://github.com/forcedotcom/source-tracking/commit/ae5adf34600676f54c0e5efa2f5e7c96e2fd10f6))
-
-
+- more metadata polling exclusions based on telemetry ([ae5adf3](https://github.com/forcedotcom/source-tracking/commit/ae5adf34600676f54c0e5efa2f5e7c96e2fd10f6))
 
 ## [1.1.1](https://github.com/forcedotcom/source-tracking/compare/v1.1.0...v1.1.1) (2022-02-23)
 
-
 ### Bug Fixes
 
-* message formatting for GA ([194ba4b](https://github.com/forcedotcom/source-tracking/commit/194ba4b4bd08a26e7f7c5c6ef28dc1fb20acc1de))
-
-
+- message formatting for GA ([194ba4b](https://github.com/forcedotcom/source-tracking/commit/194ba4b4bd08a26e7f7c5c6ef28dc1fb20acc1de))
 
 # [1.1.0](https://github.com/forcedotcom/source-tracking/compare/v1.0.2...v1.1.0) (2022-02-16)
 
-
 ### Bug Fixes
 
-* handle lwc in a pkgDir of the same name ([621d8cf](https://github.com/forcedotcom/source-tracking/commit/621d8cfc00f2eb4ded160802b2076e140d0a2d06))
-* increase max-fetch default ([9854ed8](https://github.com/forcedotcom/source-tracking/commit/9854ed8677c13d0b2d818355660ab71c144e6a3e))
-* lastIndexOf handles foo/lwc/foo ([8632ee6](https://github.com/forcedotcom/source-tracking/commit/8632ee61f88faf32024e99f1c5590f6b134a3b08))
-* smarter polling and excluded files ([6df02a7](https://github.com/forcedotcom/source-tracking/commit/6df02a716e238e38b699b98f638ef42ed8cedeca))
-
+- handle lwc in a pkgDir of the same name ([621d8cf](https://github.com/forcedotcom/source-tracking/commit/621d8cfc00f2eb4ded160802b2076e140d0a2d06))
+- increase max-fetch default ([9854ed8](https://github.com/forcedotcom/source-tracking/commit/9854ed8677c13d0b2d818355660ab71c144e6a3e))
+- lastIndexOf handles foo/lwc/foo ([8632ee6](https://github.com/forcedotcom/source-tracking/commit/8632ee61f88faf32024e99f1c5590f6b134a3b08))
+- smarter polling and excluded files ([6df02a7](https://github.com/forcedotcom/source-tracking/commit/6df02a716e238e38b699b98f638ef42ed8cedeca))
 
 ### Features
 
-* smarter polling ([3d5bb05](https://github.com/forcedotcom/source-tracking/commit/3d5bb05ccf05127304037ec6085660be5da8fe24))
-
-
+- smarter polling ([3d5bb05](https://github.com/forcedotcom/source-tracking/commit/3d5bb05ccf05127304037ec6085660be5da8fe24))
 
 ## [1.0.2](https://github.com/forcedotcom/source-tracking/compare/v1.0.1...v1.0.2) (2022-01-25)
 
-
 ### Bug Fixes
 
-* handle gitignore outside pkgDirs ([23a65c8](https://github.com/forcedotcom/source-tracking/commit/23a65c89c8b55525b5d8efe88195d734d337d82a))
-
-
+- handle gitignore outside pkgDirs ([23a65c8](https://github.com/forcedotcom/source-tracking/commit/23a65c89c8b55525b5d8efe88195d734d337d82a))
 
 ## [1.0.1](https://github.com/forcedotcom/source-tracking/compare/v1.0.0...v1.0.1) (2022-01-25)
 
-
 ### Bug Fixes
 
-* emailTempalteFolder via aliased types ([f4c88f9](https://github.com/forcedotcom/source-tracking/commit/f4c88f9b59ad6d061933bfd3f6827e44a59b0e80))
-
-
+- emailTempalteFolder via aliased types ([f4c88f9](https://github.com/forcedotcom/source-tracking/commit/f4c88f9b59ad6d061933bfd3f6827e44a59b0e80))
 
 # [1.0.0](https://github.com/forcedotcom/source-tracking/compare/v0.5.2...v1.0.0) (2022-01-20)
 
-
 ### Bug Fixes
 
-* handle element count errors ([8817329](https://github.com/forcedotcom/source-tracking/commit/8817329f8198ce701aba22c7a4476ef31a4d73a4))
-* lightning EmailTemplateFolder ([554c766](https://github.com/forcedotcom/source-tracking/commit/554c76676a85c7a4b673879116912cde51dd1498))
-* remove emailtf attempt ([262839d](https://github.com/forcedotcom/source-tracking/commit/262839dc025c7094d8868d3ae9d769dd39ad5324))
-* sourceMember excepton for nondecomposed children ([05db59e](https://github.com/forcedotcom/source-tracking/commit/05db59e7a6e070224a45f5fbf08013565c9f2131))
-
-
+- handle element count errors ([8817329](https://github.com/forcedotcom/source-tracking/commit/8817329f8198ce701aba22c7a4476ef31a4d73a4))
+- lightning EmailTemplateFolder ([554c766](https://github.com/forcedotcom/source-tracking/commit/554c76676a85c7a4b673879116912cde51dd1498))
+- remove emailtf attempt ([262839d](https://github.com/forcedotcom/source-tracking/commit/262839dc025c7094d8868d3ae9d769dd39ad5324))
+- sourceMember excepton for nondecomposed children ([05db59e](https://github.com/forcedotcom/source-tracking/commit/05db59e7a6e070224a45f5fbf08013565c9f2131))
 
 ## [0.5.2](https://github.com/forcedotcom/source-tracking/compare/v0.5.1...v0.5.2) (2022-01-05)
 
-
 ### Bug Fixes
 
-* distributed .gitignore and loose pkgDir matching ([a148a36](https://github.com/forcedotcom/source-tracking/commit/a148a366739b6941f3f479b375147897103316bb))
-* remove singleton behavior for localShadowRepo ([887bb68](https://github.com/forcedotcom/source-tracking/commit/887bb684528df8df07fe9b4edf1bd2f4165fe3e2))
-
+- distributed .gitignore and loose pkgDir matching ([a148a36](https://github.com/forcedotcom/source-tracking/commit/a148a366739b6941f3f479b375147897103316bb))
+- remove singleton behavior for localShadowRepo ([887bb68](https://github.com/forcedotcom/source-tracking/commit/887bb684528df8df07fe9b4edf1bd2f4165fe3e2))
 
 ### Features
 
-* path-scoped singleton ([de46db4](https://github.com/forcedotcom/source-tracking/commit/de46db4b08a3fe087a2931936655c75b3b7cc32c))
-
-
+- path-scoped singleton ([de46db4](https://github.com/forcedotcom/source-tracking/commit/de46db4b08a3fe087a2931936655c75b3b7cc32c))
 
 ## [0.5.1](https://github.com/forcedotcom/source-tracking/compare/v0.5.0...v0.5.1) (2021-12-03)
 
-
 ### Bug Fixes
 
-* support addressable child types ([8251095](https://github.com/forcedotcom/source-tracking/commit/82510955ba8ffe4a2e7e5411973795da3671d01e))
-
-
+- support addressable child types ([8251095](https://github.com/forcedotcom/source-tracking/commit/82510955ba8ffe4a2e7e5411973795da3671d01e))
 
 # [0.5.0](https://github.com/forcedotcom/source-tracking/compare/v0.4.4...v0.5.0) (2021-12-02)
 
-
 ### Bug Fixes
 
-* deploy by pkgDir groupings, not all ([7f1262e](https://github.com/forcedotcom/source-tracking/commit/7f1262e1d05a57d3094849d052376b13dd7a5ec7))
-* windows paths when pkgDir path has separators in it ([b0ab346](https://github.com/forcedotcom/source-tracking/commit/b0ab3468d9c54722f832fb7d27a84525d593d4f7))
-
+- deploy by pkgDir groupings, not all ([7f1262e](https://github.com/forcedotcom/source-tracking/commit/7f1262e1d05a57d3094849d052376b13dd7a5ec7))
+- windows paths when pkgDir path has separators in it ([b0ab346](https://github.com/forcedotcom/source-tracking/commit/b0ab3468d9c54722f832fb7d27a84525d593d4f7))
 
 ### Features
 
-* delete bundle member but not the bundle ([fbb81f2](https://github.com/forcedotcom/source-tracking/commit/fbb81f25af4cb9e81e3bbee93a08b072318eca10))
-* delete bundle members instead of bundle ([0aedbd5](https://github.com/forcedotcom/source-tracking/commit/0aedbd56b3bf34ce9e344ec03bb258c9db2098aa))
-* trackingFiles handle deleted bundle members ([137cd39](https://github.com/forcedotcom/source-tracking/commit/137cd391f0ea8ae60b3351d7b3361ae97b890d45))
-
+- delete bundle member but not the bundle ([fbb81f2](https://github.com/forcedotcom/source-tracking/commit/fbb81f25af4cb9e81e3bbee93a08b072318eca10))
+- delete bundle members instead of bundle ([0aedbd5](https://github.com/forcedotcom/source-tracking/commit/0aedbd56b3bf34ce9e344ec03bb258c9db2098aa))
+- trackingFiles handle deleted bundle members ([137cd39](https://github.com/forcedotcom/source-tracking/commit/137cd391f0ea8ae60b3351d7b3361ae97b890d45))
 
 ### Performance Improvements
 
-* use os.type once ([1a17be6](https://github.com/forcedotcom/source-tracking/commit/1a17be6d8289659f0b925b3ea2db2293c61a3d47))
-
-
+- use os.type once ([1a17be6](https://github.com/forcedotcom/source-tracking/commit/1a17be6d8289659f0b925b3ea2db2293c61a3d47))
 
 ## [0.4.4](https://github.com/forcedotcom/source-tracking/compare/v0.4.3...v0.4.4) (2021-12-01)
 
-
 ### Features
 
-* update version of core and sdr ([977ab56](https://github.com/forcedotcom/source-tracking/commit/977ab56deb9fa610cb21b26bfef6d30a1f9f8f58))
-
-
+- update version of core and sdr ([977ab56](https://github.com/forcedotcom/source-tracking/commit/977ab56deb9fa610cb21b26bfef6d30a1f9f8f58))
 
 ## [0.4.3](https://github.com/forcedotcom/source-tracking/compare/v0.4.2...v0.4.3) (2021-11-11)
 
-
 ### Bug Fixes
 
-* don't pull remote changes where type isn't in SDR registry ([46250ee](https://github.com/forcedotcom/source-tracking/commit/46250eef09e29dfa0d06af984bbfcc3e88765968))
-* don't pull things not in the registry ([38136bb](https://github.com/forcedotcom/source-tracking/commit/38136bbbf1e44c8e58bc06621957819913273b4e))
-
+- don't pull remote changes where type isn't in SDR registry ([46250ee](https://github.com/forcedotcom/source-tracking/commit/46250eef09e29dfa0d06af984bbfcc3e88765968))
+- don't pull things not in the registry ([38136bb](https://github.com/forcedotcom/source-tracking/commit/38136bbbf1e44c8e58bc06621957819913273b4e))
 
 ### Features
 
-* emit warnings for types not pulled ([fdeabbf](https://github.com/forcedotcom/source-tracking/commit/fdeabbfb11bb4ba1fd17931adedc49f9cb5ae658))
-
-
+- emit warnings for types not pulled ([fdeabbf](https://github.com/forcedotcom/source-tracking/commit/fdeabbfb11bb4ba1fd17931adedc49f9cb5ae658))
 
 ## [0.4.2](https://github.com/forcedotcom/source-tracking/compare/v0.4.1...v0.4.2) (2021-10-28)
 
-
-
 ## [0.4.1](https://github.com/forcedotcom/source-tracking/compare/v0.4.0...v0.4.1) (2021-10-28)
 
-
 ### Bug Fixes
 
-* better conflict handling (can match filenames or type/name) ([4441a0a](https://github.com/forcedotcom/source-tracking/commit/4441a0abd70c7f8f315e1c638b4cef7fcf3e2e68))
-* gitignore stashing location ([5145545](https://github.com/forcedotcom/source-tracking/commit/5145545eeee6c800986014327479d20e943143e5))
-* polling exclusion logic for aura meta.xml was wrong ([2d40b2e](https://github.com/forcedotcom/source-tracking/commit/2d40b2ef65ef9a3145d0c75cd4943e4325d5745c))
-
-
+- better conflict handling (can match filenames or type/name) ([4441a0a](https://github.com/forcedotcom/source-tracking/commit/4441a0abd70c7f8f315e1c638b4cef7fcf3e2e68))
+- gitignore stashing location ([5145545](https://github.com/forcedotcom/source-tracking/commit/5145545eeee6c800986014327479d20e943143e5))
+- polling exclusion logic for aura meta.xml was wrong ([2d40b2e](https://github.com/forcedotcom/source-tracking/commit/2d40b2ef65ef9a3145d0c75cd4943e4325d5745c))
 
 # [0.4.0](https://github.com/forcedotcom/source-tracking/compare/43e7fa4a44dbcb9da37d21618678687f4edda644...v0.4.0) (2021-10-22)
 
-
 ### Bug Fixes
 
-* again with the promises ([ad9dec5](https://github.com/forcedotcom/source-tracking/commit/ad9dec50336c61996456d48ee489426393c62329))
-* another attempt at node12 support ([c8736d0](https://github.com/forcedotcom/source-tracking/commit/c8736d0bbe53756d1b5572e00402e55af94003c1))
-* case of empty orgId dir ([1cb6333](https://github.com/forcedotcom/source-tracking/commit/1cb6333d14cfcee02b27711b6db273d5db31fc8e))
-* case on formatter filename ([02adf22](https://github.com/forcedotcom/source-tracking/commit/02adf22419d2bf81fb070d7d7d90f7d996bd1ada))
-* casing on imports ([d4425d9](https://github.com/forcedotcom/source-tracking/commit/d4425d9ee2ad77c4e28d32333025e59a3c7e3af9))
-* correct statusCommand description ([b834a2f](https://github.com/forcedotcom/source-tracking/commit/b834a2fa0213fbc72dbc6dc3a563cd92f413d222))
-* don't commit empty changelists ([67b9772](https://github.com/forcedotcom/source-tracking/commit/67b9772eccd6d2d4850322eb80f5a6113aac18e6))
-* export compatibility ([c6e5f7c](https://github.com/forcedotcom/source-tracking/commit/c6e5f7cba68ed6a7739b237adb027fda2442e8c4))
-* fix vscode image in readme ([441c15f](https://github.com/forcedotcom/source-tracking/commit/441c15f79dbaf4a97c84d9d6ddc923eae59bca34))
-* handle org:create's single tracking file ([008793d](https://github.com/forcedotcom/source-tracking/commit/008793d0fa15210ffb263cc5d179a0be8dcb05ff))
-* handle stash failures ([09dacc9](https://github.com/forcedotcom/source-tracking/commit/09dacc9484e48f3cba4813f3d733c66d2a30cd6b))
-* leif .yml merge [skip-validate-pr] ([ff10f84](https://github.com/forcedotcom/source-tracking/commit/ff10f84ec15757df55657ba73cc6976c5892595c))
-* local ST uses graceful via core2 ([3ba883f](https://github.com/forcedotcom/source-tracking/commit/3ba883ff2b02e27b0eb01a709f6c1e03ef91bb73))
-* match server subfiles with forward slash ([c2489a6](https://github.com/forcedotcom/source-tracking/commit/c2489a62c244a64fe0938e0eecdc087f4529b5ad))
-* normalize windows paths on commit, too ([4339e46](https://github.com/forcedotcom/source-tracking/commit/4339e46a1cb9cbeb4cc652572e340b60e3b5bc68))
-* one more fs/promises fixed for node12 ([71bafcf](https://github.com/forcedotcom/source-tracking/commit/71bafcf7738e60d8b86150199ef8d0687167a010))
-* path normalizing for metadata keys ([6190590](https://github.com/forcedotcom/source-tracking/commit/6190590df2c2e7cc9a25eab0fa8891e3b8df9057))
-* path normalizing from iso-git ([b8cddaf](https://github.com/forcedotcom/source-tracking/commit/b8cddaf40930bedd18f3edec578a030220454627))
-* status output on windows uses backslash ([78ac398](https://github.com/forcedotcom/source-tracking/commit/78ac3988d3d04e956f17f35c67de4d1144062fcb))
-* support windows path on commits with \\ ([5712af4](https://github.com/forcedotcom/source-tracking/commit/5712af4447ee03e30d7a5a769fc5ba58f6913552))
-* there could be nested LWC templates ([d833981](https://github.com/forcedotcom/source-tracking/commit/d8339810bf76c0ab75824faee7aef59ff9a2d89e))
-* turns bundle parts of SourceMembers into real MDtypes ([5646042](https://github.com/forcedotcom/source-tracking/commit/564604269be7d56499963699b51920b81227297f))
-* use correct var name ([0708312](https://github.com/forcedotcom/source-tracking/commit/0708312c5b4f11cb94539416d0a10b5432850310))
-
+- again with the promises ([ad9dec5](https://github.com/forcedotcom/source-tracking/commit/ad9dec50336c61996456d48ee489426393c62329))
+- another attempt at node12 support ([c8736d0](https://github.com/forcedotcom/source-tracking/commit/c8736d0bbe53756d1b5572e00402e55af94003c1))
+- case of empty orgId dir ([1cb6333](https://github.com/forcedotcom/source-tracking/commit/1cb6333d14cfcee02b27711b6db273d5db31fc8e))
+- case on formatter filename ([02adf22](https://github.com/forcedotcom/source-tracking/commit/02adf22419d2bf81fb070d7d7d90f7d996bd1ada))
+- casing on imports ([d4425d9](https://github.com/forcedotcom/source-tracking/commit/d4425d9ee2ad77c4e28d32333025e59a3c7e3af9))
+- correct statusCommand description ([b834a2f](https://github.com/forcedotcom/source-tracking/commit/b834a2fa0213fbc72dbc6dc3a563cd92f413d222))
+- don't commit empty changelists ([67b9772](https://github.com/forcedotcom/source-tracking/commit/67b9772eccd6d2d4850322eb80f5a6113aac18e6))
+- export compatibility ([c6e5f7c](https://github.com/forcedotcom/source-tracking/commit/c6e5f7cba68ed6a7739b237adb027fda2442e8c4))
+- fix vscode image in readme ([441c15f](https://github.com/forcedotcom/source-tracking/commit/441c15f79dbaf4a97c84d9d6ddc923eae59bca34))
+- handle org:create's single tracking file ([008793d](https://github.com/forcedotcom/source-tracking/commit/008793d0fa15210ffb263cc5d179a0be8dcb05ff))
+- handle stash failures ([09dacc9](https://github.com/forcedotcom/source-tracking/commit/09dacc9484e48f3cba4813f3d733c66d2a30cd6b))
+- leif .yml merge [skip-validate-pr] ([ff10f84](https://github.com/forcedotcom/source-tracking/commit/ff10f84ec15757df55657ba73cc6976c5892595c))
+- local ST uses graceful via core2 ([3ba883f](https://github.com/forcedotcom/source-tracking/commit/3ba883ff2b02e27b0eb01a709f6c1e03ef91bb73))
+- match server subfiles with forward slash ([c2489a6](https://github.com/forcedotcom/source-tracking/commit/c2489a62c244a64fe0938e0eecdc087f4529b5ad))
+- normalize windows paths on commit, too ([4339e46](https://github.com/forcedotcom/source-tracking/commit/4339e46a1cb9cbeb4cc652572e340b60e3b5bc68))
+- one more fs/promises fixed for node12 ([71bafcf](https://github.com/forcedotcom/source-tracking/commit/71bafcf7738e60d8b86150199ef8d0687167a010))
+- path normalizing for metadata keys ([6190590](https://github.com/forcedotcom/source-tracking/commit/6190590df2c2e7cc9a25eab0fa8891e3b8df9057))
+- path normalizing from iso-git ([b8cddaf](https://github.com/forcedotcom/source-tracking/commit/b8cddaf40930bedd18f3edec578a030220454627))
+- status output on windows uses backslash ([78ac398](https://github.com/forcedotcom/source-tracking/commit/78ac3988d3d04e956f17f35c67de4d1144062fcb))
+- support windows path on commits with \\ ([5712af4](https://github.com/forcedotcom/source-tracking/commit/5712af4447ee03e30d7a5a769fc5ba58f6913552))
+- there could be nested LWC templates ([d833981](https://github.com/forcedotcom/source-tracking/commit/d8339810bf76c0ab75824faee7aef59ff9a2d89e))
+- turns bundle parts of SourceMembers into real MDtypes ([5646042](https://github.com/forcedotcom/source-tracking/commit/564604269be7d56499963699b51920b81227297f))
+- use correct var name ([0708312](https://github.com/forcedotcom/source-tracking/commit/0708312c5b4f11cb94539416d0a10b5432850310))
 
 ### Features
 
-* add commitlint and sample circleci config ([43e7fa4](https://github.com/forcedotcom/source-tracking/commit/43e7fa4a44dbcb9da37d21618678687f4edda644))
-* add new tests and upadte readme ([6a7ad54](https://github.com/forcedotcom/source-tracking/commit/6a7ad542f42ce75275ebacc78d50ee4dc0ab6f32))
-* add option to get remoteChanges with filePaths, use for Conflicts ([350a0d6](https://github.com/forcedotcom/source-tracking/commit/350a0d60599cfce2c432c223f4523c25a4f53c81))
-* basic using isogit ([f39e6c5](https://github.com/forcedotcom/source-tracking/commit/f39e6c5e305fcb2fdb6a27b343d9dc20800202c9))
-* conflict detection ([3e22774](https://github.com/forcedotcom/source-tracking/commit/3e22774d8949a1aa4302e62d8580b69c4b35aab5))
-* consolidate conflict handling, return data in error ([45178c7](https://github.com/forcedotcom/source-tracking/commit/45178c7b13ed61e657f9a07ea5b40f49f73f651a))
-* delete handling public for pull ([eb87eb7](https://github.com/forcedotcom/source-tracking/commit/eb87eb7dfa81ba5256735af7f2b8bc29dfb1e16b))
-* finish status, add clear/reset ([c71e66f](https://github.com/forcedotcom/source-tracking/commit/c71e66f7f7a3dc20d2c965349b5e01e15edabf36))
-* handle status ignore marking from STL ([2ec6fad](https://github.com/forcedotcom/source-tracking/commit/2ec6fad4b4f4f2e124da7e4f53cf8e534354d342))
-* ignorewarnings flag for push ([b13fd05](https://github.com/forcedotcom/source-tracking/commit/b13fd0534930fb063075c39e6f75ea46ab9d3be8))
-* migrate messages/descriptions ([8fea6e5](https://github.com/forcedotcom/source-tracking/commit/8fea6e5242c50865dd635412d7592164ab57fec4))
-* most of sourceStatus logic, code cleanup ([f100cb8](https://github.com/forcedotcom/source-tracking/commit/f100cb83f220b3724284ae69301712a08b14376d))
-* non-delete push works ([487a20e](https://github.com/forcedotcom/source-tracking/commit/487a20e48c428a02ef315b58db24b714d2de0416))
-* push supporting bundle types ([639d459](https://github.com/forcedotcom/source-tracking/commit/639d459101cd4990fa217f657b99d64517611383))
-* remote and conflicts ([f98ecf1](https://github.com/forcedotcom/source-tracking/commit/f98ecf17fc6cbe386d8edae6994500388b7e0ed6))
-* remote tracknig with UT ([cb805e5](https://github.com/forcedotcom/source-tracking/commit/cb805e5745020be9a266a261f584979713e4b351))
-* source tracking from toolbelt ([6c2ebb4](https://github.com/forcedotcom/source-tracking/commit/6c2ebb444ce5518eaa81402b685fe00f1090e437))
-* sourcemember polling like toolbelt ([abdd7b3](https://github.com/forcedotcom/source-tracking/commit/abdd7b3ad275ea4739673a6e1b1a99853f1de2da))
-* spinners while waiting on pull ([dfe5aea](https://github.com/forcedotcom/source-tracking/commit/dfe5aeae0a5f9a30eddfe96852e0dab025972e1e))
-* status result sorting ([b7b109c](https://github.com/forcedotcom/source-tracking/commit/b7b109cf3e7bcad60507618099873c717ff31f61))
-* sync customObj when their fields sync ([3ded96d](https://github.com/forcedotcom/source-tracking/commit/3ded96dbd7a7ea45cb8f97719b98bae294905c05))
-* throws if "old" source files are present ([4b868d8](https://github.com/forcedotcom/source-tracking/commit/4b868d8232769eec5e227052bf823a35baedd288))
-* typed push ([6e76812](https://github.com/forcedotcom/source-tracking/commit/6e7681263b81d3b692d002a3ce5deb8ef00bbd13))
-* virtualTree for deletes ([b425d77](https://github.com/forcedotcom/source-tracking/commit/b425d77b4fca5c6fbab2faab7490e3516bf3f547))
-
+- add commitlint and sample circleci config ([43e7fa4](https://github.com/forcedotcom/source-tracking/commit/43e7fa4a44dbcb9da37d21618678687f4edda644))
+- add new tests and upadte readme ([6a7ad54](https://github.com/forcedotcom/source-tracking/commit/6a7ad542f42ce75275ebacc78d50ee4dc0ab6f32))
+- add option to get remoteChanges with filePaths, use for Conflicts ([350a0d6](https://github.com/forcedotcom/source-tracking/commit/350a0d60599cfce2c432c223f4523c25a4f53c81))
+- basic using isogit ([f39e6c5](https://github.com/forcedotcom/source-tracking/commit/f39e6c5e305fcb2fdb6a27b343d9dc20800202c9))
+- conflict detection ([3e22774](https://github.com/forcedotcom/source-tracking/commit/3e22774d8949a1aa4302e62d8580b69c4b35aab5))
+- consolidate conflict handling, return data in error ([45178c7](https://github.com/forcedotcom/source-tracking/commit/45178c7b13ed61e657f9a07ea5b40f49f73f651a))
+- delete handling public for pull ([eb87eb7](https://github.com/forcedotcom/source-tracking/commit/eb87eb7dfa81ba5256735af7f2b8bc29dfb1e16b))
+- finish status, add clear/reset ([c71e66f](https://github.com/forcedotcom/source-tracking/commit/c71e66f7f7a3dc20d2c965349b5e01e15edabf36))
+- handle status ignore marking from STL ([2ec6fad](https://github.com/forcedotcom/source-tracking/commit/2ec6fad4b4f4f2e124da7e4f53cf8e534354d342))
+- ignorewarnings flag for push ([b13fd05](https://github.com/forcedotcom/source-tracking/commit/b13fd0534930fb063075c39e6f75ea46ab9d3be8))
+- migrate messages/descriptions ([8fea6e5](https://github.com/forcedotcom/source-tracking/commit/8fea6e5242c50865dd635412d7592164ab57fec4))
+- most of sourceStatus logic, code cleanup ([f100cb8](https://github.com/forcedotcom/source-tracking/commit/f100cb83f220b3724284ae69301712a08b14376d))
+- non-delete push works ([487a20e](https://github.com/forcedotcom/source-tracking/commit/487a20e48c428a02ef315b58db24b714d2de0416))
+- push supporting bundle types ([639d459](https://github.com/forcedotcom/source-tracking/commit/639d459101cd4990fa217f657b99d64517611383))
+- remote and conflicts ([f98ecf1](https://github.com/forcedotcom/source-tracking/commit/f98ecf17fc6cbe386d8edae6994500388b7e0ed6))
+- remote tracknig with UT ([cb805e5](https://github.com/forcedotcom/source-tracking/commit/cb805e5745020be9a266a261f584979713e4b351))
+- source tracking from toolbelt ([6c2ebb4](https://github.com/forcedotcom/source-tracking/commit/6c2ebb444ce5518eaa81402b685fe00f1090e437))
+- sourcemember polling like toolbelt ([abdd7b3](https://github.com/forcedotcom/source-tracking/commit/abdd7b3ad275ea4739673a6e1b1a99853f1de2da))
+- spinners while waiting on pull ([dfe5aea](https://github.com/forcedotcom/source-tracking/commit/dfe5aeae0a5f9a30eddfe96852e0dab025972e1e))
+- status result sorting ([b7b109c](https://github.com/forcedotcom/source-tracking/commit/b7b109cf3e7bcad60507618099873c717ff31f61))
+- sync customObj when their fields sync ([3ded96d](https://github.com/forcedotcom/source-tracking/commit/3ded96dbd7a7ea45cb8f97719b98bae294905c05))
+- throws if "old" source files are present ([4b868d8](https://github.com/forcedotcom/source-tracking/commit/4b868d8232769eec5e227052bf823a35baedd288))
+- typed push ([6e76812](https://github.com/forcedotcom/source-tracking/commit/6e7681263b81d3b692d002a3ce5deb8ef00bbd13))
+- virtualTree for deletes ([b425d77](https://github.com/forcedotcom/source-tracking/commit/b425d77b4fca5c6fbab2faab7490e3516bf3f547))
 
 ### Performance Improvements
 
-* use flatmap ([8ef5883](https://github.com/forcedotcom/source-tracking/commit/8ef5883ea94e811d4ef2ab37a4999b80df813aa4))
-
+- use flatmap ([8ef5883](https://github.com/forcedotcom/source-tracking/commit/8ef5883ea94e811d4ef2ab37a4999b80df813aa4))
 
 ### Reverts
 
-* Revert "refactor: move Org from class/init to the only method that needs it (JIT)" ([367bb56](https://github.com/forcedotcom/source-tracking/commit/367bb5617fb00b85bcf9bdcba6cb4a86e95b7395))
-
-
-
+- Revert "refactor: move Org from class/init to the only method that needs it (JIT)" ([367bb56](https://github.com/forcedotcom/source-tracking/commit/367bb5617fb00b85bcf9bdcba6cb4a86e95b7395))
diff --git a/package.json b/package.json
index 83d8d5f5..fe9eeb81 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/source-tracking",
   "description": "API for tracking local and remote Salesforce metadata changes",
-  "version": "2.2.28",
+  "version": "3.0.0",
   "author": "Salesforce",
   "license": "BSD-3-Clause",
   "main": "lib/index.js",
@@ -68,6 +68,7 @@
     "eslint-plugin-header": "^3.1.1",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jsdoc": "^39.8.0",
+    "eslint-plugin-sf-plugin": "^1.14.0",
     "husky": "^7.0.4",
     "mocha": "^9.2.2",
     "nyc": "^15.1.0",
@@ -157,4 +158,4 @@
       "output": []
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/compatibility.ts b/src/compatibility.ts
deleted file mode 100644
index 644800e6..00000000
--- a/src/compatibility.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2020, salesforce.com, inc.
- * All rights reserved.
- * Licensed under the BSD 3-Clause license.
- * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
- */
-import * as fs from 'fs';
-import * as path from 'path';
-import { Org, SfError, Messages } from '@salesforce/core';
-
-Messages.importMessagesDirectory(__dirname);
-const messages = Messages.load('@salesforce/source-tracking', 'compatibility', [
-  'sourceTrackingFileVersionMismatch',
-  'clearSuggestion',
-  'useOtherVersion',
-]);
-
-type TrackingFileVersion = 'plugin-source' | 'toolbelt' | 'none';
-
-export const hasSfdxTrackingFiles = (orgId: string, projectPath: string): boolean =>
-  fs.existsSync(path.join(projectPath, '.sfdx', 'orgs', orgId));
-
-/**
- * A project can have "old" (toolbelt), "new" (plugin-source) or "none" tracking files
- *
- * @deprecated use only during transition to new source-tracking commands
- */
-export const getTrackingFileVersion = (org: Org, projectPath: string): TrackingFileVersion => {
-  const orgsDir = path.join(projectPath, '.sfdx', 'orgs');
-  const newFilesDir = path.join(orgsDir, org.getOrgId());
-  // has new tracking files based on orgId
-  if (fs.existsSync(newFilesDir) && fs.readdirSync(newFilesDir).length > 0) {
-    return 'plugin-source';
-  }
-  const username = org.getUsername();
-  if (typeof username === 'string') {
-    if (
-      // has both of the old files (org:create puts maxRevision.json in the username dir)
-      fs.existsSync(path.join(orgsDir, username, 'sourcePathInfos.json')) &&
-      fs.existsSync(path.join(orgsDir, username, 'maxRevision.json'))
-    ) {
-      return 'toolbelt';
-    }
-  }
-  return 'none';
-};
-
-/**
- * Convenient wrapper for throwing errors with helpful messages so commands don't have to
- *
- * @deprecated use only during transition to new source-tracking commands
- *
- * @param org: an Org, typically from a command's this.org
- * @param project: the project path, typically from this.project.
- * @param toValidate: whether your command lives in 'toolbelt' or 'plugin-source'
- * @param command: the command itself including all flags.  Echoed with modification for the user
- */
-export const throwIfInvalid = ({
-  org,
-  projectPath,
-  toValidate,
-  command,
-}: {
-  org: Org;
-  projectPath: string;
-  toValidate: Omit<TrackingFileVersion, 'none'>;
-  command: string;
-}): void => {
-  const trackingFileVersion = getTrackingFileVersion(org, projectPath);
-  if (trackingFileVersion === 'none' || trackingFileVersion === toValidate) {
-    return;
-  }
-
-  // We expected it to be the toolbelt version but it is using the new tracking files
-  if (toValidate === 'toolbelt') {
-    // some of the toolbelt commands aren't using SfdxCommand and the SfError actions won't be automatically displayed
-    throw new SfError(
-      `${messages.getMessage('sourceTrackingFileVersionMismatch', ['new/beta'])}\n\nTry this:\n${messages.getMessage(
-        'useOtherVersion',
-        ['new/beta', replaceRenamedCommands(command.replace(':legacy', ''))]
-      )}.\n${messages.getMessage('clearSuggestion', [
-        'new/beta',
-        replaceRenamedCommands('sfdx force:source:tracking:clear'),
-        replaceRenamedCommands('sfdx force:source:tracking:reset', true),
-      ])}.`,
-      'SourceTrackingFileVersionMismatch'
-    );
-  }
-  // We expected it to be the plugin-source version but it is using the old tracking files
-  if (toValidate === 'plugin-source') {
-    throw new SfError(
-      messages.getMessage('sourceTrackingFileVersionMismatch', ['old/legacy']),
-      'SourceTrackingFileVersionMismatch',
-      [
-        messages.getMessage('useOtherVersion', ['old/legacy', replaceRenamedCommands(command, true)]),
-        messages.getMessage('clearSuggestion', [
-          'old/legacy',
-          'sfdx force:source:legacy:tracking:clear',
-          'sfdx force:source:tracking:reset',
-        ]),
-      ]
-    );
-  }
-};
-
-/**
- * @deprecated use only during transition to new source-tracking commands
- * @param input the string that might contain things that would be replaced
- * @param reverse use the mappings backward
- * @returns string
- */
-export const replaceRenamedCommands = (input: string, reverse = false): string => {
-  renames.forEach((value, key) => {
-    input = reverse ? input.replace(value, key) : input.replace(key, value);
-  });
-  return input;
-};
-
-const renames = new Map([
-  ['force:source:legacy:status', 'force:source:status'],
-  ['force:source:legacy:push', 'force:source:push'],
-  ['force:source:legacy:pull', 'force:source:pull'],
-  ['force:source:legacy:tracking:reset', 'force:source:tracking:reset'],
-  ['force:source:legacy:tracking:clear', 'force:source:tracking:clear'],
-]);
diff --git a/src/index.ts b/src/index.ts
index 837109d1..cf4d56cc 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -6,7 +6,6 @@
  */
 
 export * from './sourceTracking';
-export * from './compatibility';
 export {
   RemoteSyncInput,
   ChangeOptionType,
diff --git a/src/shared/localShadowRepo.ts b/src/shared/localShadowRepo.ts
index e2dc1744..86c8c9a0 100644
--- a/src/shared/localShadowRepo.ts
+++ b/src/shared/localShadowRepo.ts
@@ -14,8 +14,8 @@ import * as git from 'isomorphic-git';
 import { chunkArray, isLwcLocalOnlyTest, pathIsInFolder } from './functions';
 
 /** returns the full path to where we store the shadow repo */
-const getGitDir = (orgId: string, projectPath: string, useSfdxTrackingFiles = false): string =>
-  path.join(projectPath, useSfdxTrackingFiles ? '.sfdx' : '.sf', 'orgs', orgId, 'localSourceTracking');
+const getGitDir = (orgId: string, projectPath: string): string =>
+  path.join(projectPath, '.sf', 'orgs', orgId, 'localSourceTracking');
 
 // filenames were normalized when read from isogit
 const toFilenames = (rows: StatusRow[]): string[] => rows.map((row) => row[FILE]);
@@ -24,7 +24,6 @@ interface ShadowRepoOptions {
   orgId: string;
   projectPath: string;
   packageDirs: NamedPackageDir[];
-  hasSfdxTrackingFiles: boolean;
 }
 
 // https://isomorphic-git.org/docs/en/statusMatrix#docsNav
@@ -57,7 +56,7 @@ export class ShadowRepo {
   private maxFileAdd: number;
 
   private constructor(options: ShadowRepoOptions) {
-    this.gitDir = getGitDir(options.orgId, options.projectPath, options.hasSfdxTrackingFiles);
+    this.gitDir = getGitDir(options.orgId, options.projectPath);
     this.projectPath = options.projectPath;
     this.packageDirs = options.packageDirs;
     this.isWindows = os.type() === 'Windows_NT';
diff --git a/src/shared/remoteSourceTrackingService.ts b/src/shared/remoteSourceTrackingService.ts
index 84c120da..d13e9965 100644
--- a/src/shared/remoteSourceTrackingService.ts
+++ b/src/shared/remoteSourceTrackingService.ts
@@ -35,7 +35,6 @@ export namespace RemoteSourceTrackingService {
   export interface Options extends ConfigFile.Options {
     org: Org;
     projectPath: string;
-    useSfdxTrackingFiles: boolean;
   }
 }
 
@@ -107,8 +106,8 @@ export class RemoteSourceTrackingService extends ConfigFile<RemoteSourceTracking
     return 'maxRevision.json';
   }
 
-  public static getFilePath(orgId: string, useSfdxTrackingFiles = false): string {
-    return path.join(useSfdxTrackingFiles ? '.sfdx' : '.sf', 'orgs', orgId, RemoteSourceTrackingService.getFileName());
+  public static getFilePath(orgId: string): string {
+    return path.join('.sf', 'orgs', orgId, RemoteSourceTrackingService.getFileName());
   }
 
   /**
@@ -117,8 +116,8 @@ export class RemoteSourceTrackingService extends ConfigFile<RemoteSourceTracking
    * @param orgId
    * @returns the path of the deleted source tracking file
    */
-  public static async delete(orgId: string, useSfdxTrackingFiles = false): Promise<string> {
-    const fileToDelete = RemoteSourceTrackingService.getFilePath(orgId, useSfdxTrackingFiles);
+  public static async delete(orgId: string): Promise<string> {
+    const fileToDelete = RemoteSourceTrackingService.getFilePath(orgId);
     // the file might not exist, in which case we don't need to delete it
     if (fs.existsSync(fileToDelete)) {
       await fs.promises.unlink(fileToDelete);
@@ -135,7 +134,7 @@ export class RemoteSourceTrackingService extends ConfigFile<RemoteSourceTracking
     this.logger = await Logger.child(this.constructor.name);
     this.options = {
       ...this.options,
-      stateFolder: this.options.useSfdxTrackingFiles ? '.sfdx' : '.sf',
+      stateFolder: '.sf',
       filename: RemoteSourceTrackingService.getFileName(),
       filePath: path.join('orgs', this.org.getOrgId()),
     };
@@ -557,7 +556,7 @@ export class RemoteSourceTrackingService extends ConfigFile<RemoteSourceTracking
   private async query(query: string, quiet = false): Promise<SourceMember[]> {
     if (!(await this.org.tracksSource())) {
       Messages.importMessagesDirectory(__dirname);
-      const messages = Messages.load('@salesforce/source-tracking', 'source', ['NonSourceTrackedOrgError']);
+      const messages = Messages.loadMessages('@salesforce/source-tracking', 'source');
       throw new SfError(messages.getMessage('NonSourceTrackedOrgError'), 'NonSourceTrackedOrgError');
     }
     if (!quiet) {
@@ -578,12 +577,12 @@ export class RemoteSourceTrackingService extends ConfigFile<RemoteSourceTracking
  * Useful for correcing bundle types where the files show change results with types but aren't resolvable
  */
 export const remoteChangeElementToChangeResult = (rce: RemoteChangeElement): ChangeResult => ({
-    ...rce,
-    ...(mappingsForSourceMemberTypesToMetadataType.has(rce.type)
-      ? {
-          name: rce.name.split('/')[0],
-          type: mappingsForSourceMemberTypesToMetadataType.get(rce.type),
-        }
-      : {}),
-    origin: 'remote', // we know they're remote
-  });
+  ...rce,
+  ...(mappingsForSourceMemberTypesToMetadataType.has(rce.type)
+    ? {
+        name: rce.name.split('/')[0],
+        type: mappingsForSourceMemberTypesToMetadataType.get(rce.type),
+      }
+    : {}),
+  origin: 'remote', // we know they're remote
+});
diff --git a/src/sourceTracking.ts b/src/sourceTracking.ts
index 7184652f..48259465 100644
--- a/src/sourceTracking.ts
+++ b/src/sourceTracking.ts
@@ -43,7 +43,6 @@ import {
 import { sourceComponentGuard } from './shared/guards';
 import { supportsPartialDelete, pathIsInFolder, ensureRelative } from './shared/functions';
 import { registrySupportsType } from './shared/metadataKeys';
-import { hasSfdxTrackingFiles } from './compatibility';
 import { populateFilePaths } from './shared/populateFilePaths';
 import { populateTypesAndNames } from './shared/populateTypesAndNames';
 import { getComponentSets, getGroupedFiles } from './shared/localComponentSetArray';
@@ -89,7 +88,6 @@ export class SourceTracking extends AsyncCreatable {
   private localRepo!: ShadowRepo;
   private remoteSourceTrackingService!: RemoteSourceTrackingService;
   private forceIgnore!: ForceIgnore;
-  private hasSfdxTrackingFiles: boolean;
   private ignoreConflicts: boolean;
   private subscribeSDREvents: boolean;
   private ignoreLocalCache: boolean;
@@ -106,7 +104,6 @@ export class SourceTracking extends AsyncCreatable {
     this.ignoreConflicts = options.ignoreConflicts ?? false;
     this.ignoreLocalCache = options.ignoreLocalCache ?? false;
     this.subscribeSDREvents = options.subscribeSDREvents ?? false;
-    this.hasSfdxTrackingFiles = hasSfdxTrackingFiles(this.orgId, this.projectPath);
   }
 
   // eslint-disable-next-line class-methods-use-this
@@ -459,7 +456,6 @@ export class SourceTracking extends AsyncCreatable {
       orgId: this.orgId,
       projectPath: normalize(this.projectPath),
       packageDirs: this.packagesDirs,
-      hasSfdxTrackingFiles: this.hasSfdxTrackingFiles,
     });
     // loads the status from file so that it's cached
     await this.localRepo.getStatus();
@@ -479,7 +475,6 @@ export class SourceTracking extends AsyncCreatable {
     this.remoteSourceTrackingService = await RemoteSourceTrackingService.getInstance({
       org: this.org,
       projectPath: this.projectPath,
-      useSfdxTrackingFiles: this.hasSfdxTrackingFiles,
     });
     if (initializeWithQuery) {
       await this.remoteSourceTrackingService.retrieveUpdates();
@@ -516,7 +511,7 @@ export class SourceTracking extends AsyncCreatable {
    * Deletes the remote tracking files
    */
   public async clearRemoteTracking(): Promise<string> {
-    return RemoteSourceTrackingService.delete(this.orgId, this.hasSfdxTrackingFiles);
+    return RemoteSourceTrackingService.delete(this.orgId);
   }
 
   /**
diff --git a/test/nuts/local/commitPerf.nut.ts b/test/nuts/local/commitPerf.nut.ts
index 10b653b1..10121a82 100644
--- a/test/nuts/local/commitPerf.nut.ts
+++ b/test/nuts/local/commitPerf.nut.ts
@@ -32,7 +32,6 @@ describe('perf testing for big commits', () => {
       orgId: 'fakeOrgId',
       projectPath: session.project.dir,
       packageDirs: [{ path: 'force-app', name: 'force-app', fullPath: path.join(session.project.dir, 'force-app') }],
-      hasSfdxTrackingFiles: false,
     });
   });
 
diff --git a/test/nuts/local/localTrackingScenario.nut.ts b/test/nuts/local/localTrackingScenario.nut.ts
index 2fe51938..a3e54cb9 100644
--- a/test/nuts/local/localTrackingScenario.nut.ts
+++ b/test/nuts/local/localTrackingScenario.nut.ts
@@ -34,7 +34,6 @@ describe('end-to-end-test for local tracking', () => {
       orgId: 'fakeOrgId',
       projectPath: session.project.dir,
       packageDirs: [{ path: 'force-app', name: 'force-app', fullPath: path.join(session.project.dir, 'force-app') }],
-      hasSfdxTrackingFiles: false,
     });
     // verify the local tracking files/directories
     expect(fs.existsSync(repo.gitDir));
diff --git a/test/nuts/local/nonTopLevelIgnore.nut.ts b/test/nuts/local/nonTopLevelIgnore.nut.ts
index dea74dda..480903cc 100644
--- a/test/nuts/local/nonTopLevelIgnore.nut.ts
+++ b/test/nuts/local/nonTopLevelIgnore.nut.ts
@@ -27,7 +27,6 @@ describe('handles non-top-level ignore inside project dir', () => {
       orgId: 'fakeOrgId2',
       projectPath: session.project.dir,
       packageDirs: [{ path: 'classes', name: 'classes', fullPath: path.join(session.project.dir, 'classes') }],
-      hasSfdxTrackingFiles: false,
     });
     // verify the local tracking files/directories
     expect(fs.existsSync(repo.gitDir));
@@ -62,7 +61,6 @@ describe('handles non-top-level ignore outside project dir', () => {
       orgId: 'fakeOrgId2',
       projectPath: session.project.dir,
       packageDirs: [{ path: 'classes', name: 'classes', fullPath: path.join(session.project.dir, 'classes') }],
-      hasSfdxTrackingFiles: false,
     });
     // verify the local tracking files/directories
     expect(fs.existsSync(repo.gitDir));
diff --git a/test/nuts/local/pkgDirMatching.nut.ts b/test/nuts/local/pkgDirMatching.nut.ts
index 58a09839..08d1fd07 100644
--- a/test/nuts/local/pkgDirMatching.nut.ts
+++ b/test/nuts/local/pkgDirMatching.nut.ts
@@ -28,7 +28,6 @@ describe('verifies exact match of pkgDirs', () => {
       orgId: 'fakeOrgId3',
       projectPath: session.project.dir,
       packageDirs: [{ path: 'force-app', name: 'force-app', fullPath: path.join(session.project.dir, 'force-app') }],
-      hasSfdxTrackingFiles: false,
     });
     // verify the local tracking files/directories
     expect(fs.existsSync(repo.gitDir));
diff --git a/test/nuts/local/relativePkgDirs.nut.ts b/test/nuts/local/relativePkgDirs.nut.ts
index f8ee8ebb..ff739907 100644
--- a/test/nuts/local/relativePkgDirs.nut.ts
+++ b/test/nuts/local/relativePkgDirs.nut.ts
@@ -30,7 +30,6 @@ describe('verifies behavior of relative pkgDirs', () => {
       packageDirs: [
         { path: './force-app', name: 'force-app', fullPath: path.join(session.project.dir, './force-app') },
       ],
-      hasSfdxTrackingFiles: false,
     });
     // verify the local tracking files/directories
     expect(fs.existsSync(repo.gitDir));
diff --git a/test/nuts/local/tracking-scale.nut.ts b/test/nuts/local/tracking-scale.nut.ts
index 21f9e51e..557363fb 100644
--- a/test/nuts/local/tracking-scale.nut.ts
+++ b/test/nuts/local/tracking-scale.nut.ts
@@ -61,7 +61,6 @@ describe(`verify tracking handles an add of ${classCount.toLocaleString()} class
       orgId: 'fakeOrgId',
       projectPath: session.project.dir,
       packageDirs: [{ path: 'force-app', name: 'force-app', fullPath: path.join(session.project.dir, 'force-app') }],
-      hasSfdxTrackingFiles: false,
     });
   });
 
diff --git a/test/unit/localShadowRepo.test.ts b/test/unit/localShadowRepo.test.ts
index 5c2c059d..ad9553b9 100644
--- a/test/unit/localShadowRepo.test.ts
+++ b/test/unit/localShadowRepo.test.ts
@@ -37,7 +37,6 @@ describe('localShadowRepo', () => {
             path: path.join(projectDir, 'force-app'),
           },
         ],
-        hasSfdxTrackingFiles: false,
       });
 
       const gitAdd = sinon.spy(git, 'add');
diff --git a/test/unit/remoteSourceTracking.test.ts b/test/unit/remoteSourceTracking.test.ts
index 20b02e9a..88867c47 100644
--- a/test/unit/remoteSourceTracking.test.ts
+++ b/test/unit/remoteSourceTracking.test.ts
@@ -62,7 +62,6 @@ describe('remoteSourceTrackingService', () => {
     remoteSourceTrackingService = await RemoteSourceTrackingService.create({
       org,
       projectPath: await $$.localPathRetriever($$.id),
-      useSfdxTrackingFiles: false,
     });
   });
 
@@ -350,25 +349,5 @@ describe('remoteSourceTrackingService', () => {
       const fileLocation = remoteSourceTrackingService.getPath();
       expect(fileLocation).to.include(`.sf${sep}`);
     });
-    it('should return the correct file location (sfdx legacy case)', async () => {
-      // redo the context
-      restoreContext($$);
-      stubContext($$);
-      const orgData = new MockTestOrgData();
-      orgData.username = username;
-      orgData.orgId = orgId;
-      orgData.tracksSource = true;
-      await $$.stubAuths(orgData);
-      const org = await Org.create({ aliasOrUsername: username });
-      $$.SANDBOX.stub(org.getConnection().tooling, 'query').resolves({ records: [], done: true, totalSize: 0 });
-      remoteSourceTrackingService = await RemoteSourceTrackingService.create({
-        org,
-        projectPath: await $$.localPathRetriever($$.id),
-        useSfdxTrackingFiles: true,
-      });
-
-      const fileLocation = remoteSourceTrackingService.getPath();
-      expect(fileLocation).to.include(`.sfdx${sep}`);
-    });
   });
 });
diff --git a/yarn.lock b/yarn.lock
index 36c0bd60..1e4e7fc0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -698,9 +698,9 @@
     tslib "^2"
 
 "@oclif/core@^2.7.1", "@oclif/core@^2.8.0":
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.8.1.tgz#3e00562bec5232886557355aad73e248097664b9"
-  integrity sha512-GnJNTR6+TmrvBBHTXFPV7oqhEbJ6Rv+pnG6XVag6MUwzKjIrhotyT2DH2/QkIQ+J2wgsqQvo2hcB9QuoBC3Ipg==
+  version "2.8.2"
+  resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.8.2.tgz#86fc31f20419dbb3cd25f89f4f1d83760c60f7c0"
+  integrity sha512-g50NrCdEcFlBfuwZb9RxLmxPNQ9wIaBPOiwbxlGYRkHMnsC6LNHcvVtyDnmndU8qoXrmCOZ6ocSZenOMlG+G1w==
   dependencies:
     "@types/cli-progress" "^3.11.0"
     ansi-escapes "^4.3.2"
@@ -1173,12 +1173,12 @@
   resolved "https://registry.yarnpkg.com/@types/expect/-/expect-1.20.4.tgz#8288e51737bf7e3ab5d7c77bfa695883745264e5"
   integrity sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==
 
-"@types/glob@*":
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc"
-  integrity sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==
+"@types/glob@~7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
+  integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
   dependencies:
-    "@types/minimatch" "^5.1.2"
+    "@types/minimatch" "*"
     "@types/node" "*"
 
 "@types/graceful-fs@^4.1.6":
@@ -1210,16 +1210,16 @@
   dependencies:
     "@types/node" "*"
 
+"@types/minimatch@*":
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
+  integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
+
 "@types/minimatch@^3.0.3":
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
   integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
 
-"@types/minimatch@^5.1.2":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
-  integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
-
 "@types/minimist@^1.2.0":
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
@@ -1268,11 +1268,11 @@
   integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
 
 "@types/shelljs@^0.8.11":
-  version "0.8.11"
-  resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.8.11.tgz#17a5696c825974e96828e96e89585d685646fcb8"
-  integrity sha512-x9yaMvEh5BEaZKeVQC4vp3l+QoFj3BXcd4aYfuKSzIIyihjdVARAadYy3SMNIz0WCCdS2vB9JL/U6GQk5PaxQw==
+  version "0.8.12"
+  resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.8.12.tgz#79dc9632af7d5ca1b5afb65a6bfc1422d79b5fa0"
+  integrity sha512-ZA8U81/gldY+rR5zl/7HSHrG2KDfEb3lzG6uCUDhW1DTQE9yC/VBQ45fXnXq8f3CgInfhZmjtdu/WOUlrXRQUg==
   dependencies:
-    "@types/glob" "*"
+    "@types/glob" "~7.2.0"
     "@types/node" "*"
 
 "@types/sinon@10.0.11":
@@ -1357,7 +1357,7 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.58.0":
+"@typescript-eslint/utils@5.58.0", "@typescript-eslint/utils@^5.58.0":
   version "5.58.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.58.0.tgz#430d7c95f23ec457b05be5520c1700a0dfd559d5"
   integrity sha512-gAmLOTFXMXOC+zP1fsqm3VceKSBQJNzV385Ok3+yzlavNHZoedajjS4UyS21gabJYcobuigQPs/z71A9MdJFqQ==
@@ -1718,9 +1718,9 @@ available-typed-arrays@^1.0.5:
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
 aws-sdk@^2.1231.0:
-  version "2.1356.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1356.0.tgz#e8ff70ebba7e13060e6972034bbf69d186523bfb"
-  integrity sha512-At7/tPJrAxlSIuyv/KpjgoNZSVp4y6nmrfcf89xe4KTR3+SRXnX4X0646bkCyU58jjSguqPjSJopsAFK16jdjg==
+  version "2.1357.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1357.0.tgz#779628a6e2db847f2fbb3687f01c7557b92cc581"
+  integrity sha512-bSOfBCVPQ/0NWYpPl34MgqMbJf0eO6PsyVlmjbStlba+98hnE6X7z67tawBRot7S+qH3L49KW2u6dfJjvhDfdQ==
   dependencies:
     buffer "4.9.2"
     events "1.1.1"
@@ -2789,9 +2789,9 @@ ejs@^3.1.8:
     jake "^10.8.5"
 
 electron-to-chromium@^1.4.284:
-  version "1.4.359"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.359.tgz#5c4d13cb08032469fcd6bd36457915caa211356b"
-  integrity sha512-OoVcngKCIuNXtZnsYoqlCvr0Cf3NIPzDIgwUfI9bdTFjXCrr79lI0kwQstLPZ7WhCezLlGksZk/BFAzoXC7GDw==
+  version "1.4.360"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.360.tgz#7a24cf81588d6af82ab17d77715cdc09dacfafb2"
+  integrity sha512-EP/jdF15S+l3iSSzgUpUqeazvkbVFXNuVxwwLMVUSie3lUeH1HH70gKe0IS7TASB/0h5QPG2bLMzv2jelSztIQ==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
@@ -3050,6 +3050,14 @@ eslint-plugin-prefer-arrow@^1.2.1:
   resolved "https://registry.yarnpkg.com/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.3.tgz#e7fbb3fa4cd84ff1015b9c51ad86550e55041041"
   integrity sha512-J9I5PKCOJretVuiZRGvPQxCbllxGAV/viI20JO3LYblAodofBxyMnZAJ+WGeClHgANnSJberTNoFWWjrWKBuXQ==
 
+eslint-plugin-sf-plugin@^1.14.0:
+  version "1.15.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-sf-plugin/-/eslint-plugin-sf-plugin-1.15.1.tgz#c922cd4825d118fcfcb4b20629d9d65b0d394d89"
+  integrity sha512-D2i0EiQfTOjVNPivS2Bib/YsLS+l+QU5i72NT4Lhn4nSCTb5VS19PP7lLjlFlW5ffg552q7li3BMM6Cs75YQgw==
+  dependencies:
+    "@salesforce/core" "^3.34.6"
+    "@typescript-eslint/utils" "^5.58.0"
+
 eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
@@ -5616,9 +5624,9 @@ object.values@^1.1.5, object.values@^1.1.6:
     es-abstract "^1.20.4"
 
 oclif@^3.7.0:
-  version "3.7.3"
-  resolved "https://registry.yarnpkg.com/oclif/-/oclif-3.7.3.tgz#822bb37626e65bf49d6644f07477dc3523fe0f4f"
-  integrity sha512-yQ85UkSJAsDIRx0DXrp287GyvsBc2piyk3a8wup8/T+wxmsdEvWW+SaDWIQfpHNzMHYHrGus0hGW2ZwNvcNgjg==
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/oclif/-/oclif-3.8.0.tgz#002a516c054bcdcd2a2d76a34a7749b603171ad9"
+  integrity sha512-XOPAetRmTzH2FTV+cHMoX7YnXKFzsEK5TMAiyvM/J/qvcUzU2QixEGzlxQtez3Tv9MCPW5W6z/0W3Sb6zULl6w==
   dependencies:
     "@oclif/core" "^2.8.0"
     "@oclif/plugin-help" "^5.1.19"