From ad6be7cff5d5d8b3317ee7e104502ac44c106f18 Mon Sep 17 00:00:00 2001
From: Peter Hale <peter.hale@salesforce.com>
Date: Wed, 22 Mar 2023 10:04:28 -0600
Subject: [PATCH 01/23] fix: use ability to omit default and defaultHelp from
 manifest

@W-12513575@
@W-11868418@
---
 package.json          | 27 +++++++-------
 src/flags/orgFlags.ts | 12 +++---
 yarn.lock             | 85 ++++++++++++++++++++++---------------------
 3 files changed, 63 insertions(+), 61 deletions(-)

diff --git a/package.json b/package.json
index 6e0f5ba9..006a7d3b 100644
--- a/package.json
+++ b/package.json
@@ -32,19 +32,19 @@
     "/messages"
   ],
   "dependencies": {
-    "@oclif/core": "^2.4.0",
-    "@salesforce/core": "^3.34.1",
-    "@salesforce/kit": "^1.9.0",
+    "@oclif/core": "^2.7.0",
+    "@salesforce/core": "^3.34.4",
+    "@salesforce/kit": "^1.9.2",
     "@salesforce/ts-types": "^1.7.3",
     "chalk": "^4",
     "inquirer": "^8.2.5"
   },
   "devDependencies": {
-    "@oclif/test": "^2.3.8",
-    "@salesforce/dev-config": "^3.0.0",
-    "@salesforce/dev-scripts": "^4.1.2",
+    "@oclif/test": "^2.3.11",
+    "@salesforce/dev-config": "^3.1.0",
+    "@salesforce/dev-scripts": "^4.1.3",
     "@salesforce/prettier-config": "^0.0.2",
-    "@salesforce/ts-sinon": "^1.4.2",
+    "@salesforce/ts-sinon": "^1.4.6",
     "@types/inquirer": "^8.2.3",
     "@typescript-eslint/eslint-plugin": "^5.44.0",
     "@typescript-eslint/parser": "^5.47.0",
@@ -83,7 +83,7 @@
       "command": "tsc -p . --pretty --incremental",
       "files": [
         "src/**/*.ts",
-        "tsconfig.json",
+        "**/tsconfig.json",
         "messages/**"
       ],
       "output": [
@@ -109,7 +109,8 @@
         "src/**/*.ts",
         "test/**/*.ts",
         "messages/**",
-        ".eslint*"
+        "**/.eslint*",
+        "**/tsconfig.json"
       ],
       "output": []
     },
@@ -117,8 +118,7 @@
       "command": "tsc -p \"./test\" --pretty",
       "files": [
         "test/**/*.ts",
-        "tsconfig.json",
-        "test/tsconfig.json"
+        "**/tsconfig.json"
       ],
       "output": []
     },
@@ -136,13 +136,12 @@
       "files": [
         "test/**/*.ts",
         "src/**/*.ts",
-        "tsconfig.json",
+        "**/tsconfig.json",
         ".mocha*",
-        "test/tsconfig.json",
         "!*.nut.ts",
         ".nycrc"
       ],
       "output": []
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/flags/orgFlags.ts b/src/flags/orgFlags.ts
index 28aa3c9c..e9ad8d16 100644
--- a/src/flags/orgFlags.ts
+++ b/src/flags/orgFlags.ts
@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import { Flags } from '@oclif/core';
-import { Messages, Org, ConfigAggregator, OrgConfigProperties } from '@salesforce/core';
+import { ConfigAggregator, Messages, Org, OrgConfigProperties } from '@salesforce/core';
 
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/sf-plugins-core', 'messages');
@@ -102,7 +102,7 @@ export const optionalOrgFlag = Flags.custom({
   char: 'o',
   parse: async (input: string | undefined) => maybeGetOrg(input),
   default: async () => maybeGetOrg(),
-  defaultHelp: async () => (await maybeGetOrg())?.getUsername(),
+  defaultHelp: async (_, isWritingManifest) => (!isWritingManifest ? (await maybeGetOrg())?.getUsername() : undefined),
 });
 
 /**
@@ -132,7 +132,8 @@ export const requiredOrgFlag = Flags.custom({
   summary: messages.getMessage('flags.targetOrg.summary'),
   parse: async (input: string | undefined) => getOrgOrThrow(input),
   default: async () => getOrgOrThrow(),
-  defaultHelp: async () => (await getOrgOrThrow())?.getUsername(),
+  defaultHelp: async (_, isWritingManifest) =>
+    !isWritingManifest ? (await getOrgOrThrow())?.getUsername() : undefined,
   required: true,
 });
 
@@ -163,7 +164,8 @@ export const requiredHubFlag = Flags.custom({
   summary: messages.getMessage('flags.targetDevHubOrg.summary'),
   parse: async (input: string | undefined) => getHubOrThrow(input),
   default: async () => getHubOrThrow(),
-  defaultHelp: async () => (await getHubOrThrow())?.getUsername(),
+  defaultHelp: async (_, isWritingManifest) =>
+    !isWritingManifest ? (await getHubOrThrow())?.getUsername() : undefined,
   required: true,
 });
 
@@ -193,6 +195,6 @@ export const optionalHubFlag = Flags.custom({
   summary: messages.getMessage('flags.targetDevHubOrg.summary'),
   parse: async (input: string | undefined) => maybeGetHub(input),
   default: async () => maybeGetHub(),
-  defaultHelp: async () => (await maybeGetHub())?.getUsername(),
+  defaultHelp: async (_, isWritingManifest) => (!isWritingManifest ? (await maybeGetHub())?.getUsername() : undefined),
   required: false,
 });
diff --git a/yarn.lock b/yarn.lock
index 62c02f3b..02aea5b9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -675,10 +675,10 @@
     supports-color "^8.1.1"
     tslib "^2"
 
-"@oclif/core@^2.1.7", "@oclif/core@^2.3.0", "@oclif/core@^2.3.1", "@oclif/core@^2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.4.0.tgz#8e5983dd0d50a3c0c170a844fe8925cb639f0a9f"
-  integrity sha512-wWUnOOfQQty0k1Cstm/iWW6pbG0mHzU7rcUtab2Sni9kjBPCcy6ENTgpsWbb/WdITopqtXmvpYII2fgcjKdzUA==
+"@oclif/core@^2.1.7", "@oclif/core@^2.3.0", "@oclif/core@^2.3.1", "@oclif/core@^2.6.4", "@oclif/core@^2.7.0":
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.7.0.tgz#18223631f32d60589d528f3fd5f61832018e5f80"
+  integrity sha512-8+qll0gr+if7QxZ5PBxhSFDK67uR62lJvUHTnQ5p1lzapHO/ucwA5YIiSn6LtIsKnP7l0uDINegXb9z8lNM/OQ==
   dependencies:
     "@types/cli-progress" "^3.11.0"
     ansi-escapes "^4.3.2"
@@ -704,6 +704,7 @@
     strip-ansi "^6.0.1"
     supports-color "^8.1.1"
     supports-hyperlinks "^2.2.0"
+    ts-node "^10.9.1"
     tslib "^2.5.0"
     widest-line "^3.1.0"
     wordwrap "^1.0.0"
@@ -739,13 +740,13 @@
     lodash "^4.17.21"
     semver "^7.3.8"
 
-"@oclif/test@^2.3.8":
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/@oclif/test/-/test-2.3.8.tgz#ad2fb6375cb9891ebc002258d090075b8621ed0e"
-  integrity sha512-usE2GeE2S+feOgf8uFLUUVDKt0N3orH+pc1bKkKQtCNAFDvdyAdAMcBS+1PnmCn+cSxaez0bCQ6xOpxA9s7x3A==
+"@oclif/test@^2.3.11":
+  version "2.3.11"
+  resolved "https://registry.yarnpkg.com/@oclif/test/-/test-2.3.11.tgz#efb268b2313bfe89c0ceee08497cbca8fc8f7b3d"
+  integrity sha512-QZGhAla1+lfXGJfzB/7yMs1rtdjmHFuu9prBxuT6yHKXTIdi5vwqDZKKzlZzJhtNLe+37ub/Z7uk0zT7dXbhBA==
   dependencies:
-    "@oclif/core" "^2.3.1"
-    fancy-test "^2.0.12"
+    "@oclif/core" "^2.6.4"
+    fancy-test "^2.0.13"
 
 "@octokit/auth-token@^2.4.4":
   version "2.5.0"
@@ -860,10 +861,10 @@
     mv "~2"
     safe-json-stringify "~1"
 
-"@salesforce/core@^3.34.1":
-  version "3.34.1"
-  resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-3.34.1.tgz#dd52254cc63143ebad58d53bb80c00a76b303868"
-  integrity sha512-mhq7pBU3aTaXdBeheIfsBa3/TxHW0ccLhTZ4pMHawViO+tubXvcU7oa7yWCwI9sQP3S1ZsXwlUPWasbbBEXKHw==
+"@salesforce/core@^3.34.4":
+  version "3.34.4"
+  resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-3.34.4.tgz#6fa11c32f14d20130a0c92c5d306f368671ec104"
+  integrity sha512-WasR/6IXKcNj3MgZIcVaT7W5Ic/blxOgpQIzob/7JEsnLVr3pPPb+9/axRvxEGdJr/gOnL1vR0NbBX+Mz6TtkQ==
   dependencies:
     "@salesforce/bunyan" "^2.0.0"
     "@salesforce/kit" "^1.9.2"
@@ -877,21 +878,21 @@
     debug "^3.2.7"
     faye "^1.4.0"
     form-data "^4.0.0"
-    graceful-fs "^4.2.9"
+    graceful-fs "^4.2.11"
     js2xmlparser "^4.0.1"
-    jsforce "^2.0.0-beta.19"
+    jsforce "^2.0.0-beta.20"
     jsonwebtoken "9.0.0"
     ts-retry-promise "^0.7.0"
 
-"@salesforce/dev-config@^3.0.0":
+"@salesforce/dev-config@^3.0.0", "@salesforce/dev-config@^3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@salesforce/dev-config/-/dev-config-3.1.0.tgz#8eb5b35860ff60d1c1dc3fd9329b01a28475d5b9"
   integrity sha512-cPph7ibj3DeSzWDFLcLtxOh5fmUlDUY2Ezq43n0V6auVP+l8orxRHjCExHS86SB3QKVgXkC8yYhryXiS8KF7Zw==
 
-"@salesforce/dev-scripts@^4.1.2":
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-4.1.2.tgz#d9d4b403ac06934c069ca16d849ff7c2e12ee773"
-  integrity sha512-mxpwOb818k4H04DM/GV0/ZTzK5EDovcnROI+0CnR71Fqc4gwrWBmK+jlcRtICGypC48W+myOXKXet0oySQphyA==
+"@salesforce/dev-scripts@^4.1.3":
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-4.1.3.tgz#e6d561e13f148d9ae6eec80d0e2e24303011e03c"
+  integrity sha512-RDZTM1Im2P++zRWSiLSGY31E+SYkHk+18uikMigZZm0XQsZf04XjDz0JMXujewMWWFnObJM0gKrswcDK/O9qSg==
   dependencies:
     "@commitlint/cli" "^17.1.2"
     "@commitlint/config-conventional" "^17.1.0"
@@ -928,7 +929,7 @@
     typescript "^4.1.3"
     wireit "^0.9.5"
 
-"@salesforce/kit@^1.9.0", "@salesforce/kit@^1.9.2":
+"@salesforce/kit@^1.9.2":
   version "1.9.2"
   resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-1.9.2.tgz#d232f135428363cdfe2649cb99a94bc2eb0a12fd"
   integrity sha512-kjZvjFNP6njhAiEa/ErdLXSDWZKafHYJyKCKz1wnSFmDM8TOpKHCCVw5cQo87ZQr8OqxqwUDIAlSBLyMzKi4Lg==
@@ -947,14 +948,14 @@
   resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.5.0.tgz#8bfe2cb5d7cb29d3394b3b9cfb71bb527009c82c"
   integrity sha512-EKFBURBuON7cj8XZCW+ybeSRRw7wUP1XUXZVHzFgx8KiYmSeGiRHBYbDjQOsQMho2uOLsTozMPEt2ehYnji0YA==
 
-"@salesforce/ts-sinon@^1.4.2":
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/@salesforce/ts-sinon/-/ts-sinon-1.4.4.tgz#ee7039f7eb6c488d58b0a3365e7196e9b1b1ebb4"
-  integrity sha512-27kF+8flAEGGikIrLrGkDiFUCgukhRf2cRhYBbD0ihG8RedsYoFTsEW9gG9VApVgWACyhkEmGICisJl8LRD7Rg==
+"@salesforce/ts-sinon@^1.4.6":
+  version "1.4.6"
+  resolved "https://registry.yarnpkg.com/@salesforce/ts-sinon/-/ts-sinon-1.4.6.tgz#50ac8f091ae546bcc5b1a2b0937f566e3f9683c6"
+  integrity sha512-yWed+QzGU3UOSX9ytg09ELWA7Oc5BAK4MVYv8Ap9uUbkg6tylETF7nzuMkvP49TaZcKC7zOG6MBebKNVZqUjPw==
   dependencies:
-    "@salesforce/ts-types" "^1.7.2"
+    "@salesforce/ts-types" "^1.7.3"
     sinon "^5.1.1"
-    tslib "^2.2.0"
+    tslib "^2.5.0"
 
 "@salesforce/ts-types@^1.7.2", "@salesforce/ts-types@^1.7.3":
   version "1.7.3"
@@ -3087,10 +3088,10 @@ external-editor@^3.0.3:
     iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
-fancy-test@^2.0.12:
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/fancy-test/-/fancy-test-2.0.12.tgz#a93cd92ffc23f70b069c39f19940d34f64c6ca67"
-  integrity sha512-S7qVQNaViLTMzn71huZvrUCV59ldq+enQ1EQOkdNbl4q4Om97gwqbYKvZoglsnzCWRRFaFP+qHynpdqaLdiZqg==
+fancy-test@^2.0.13:
+  version "2.0.15"
+  resolved "https://registry.yarnpkg.com/fancy-test/-/fancy-test-2.0.15.tgz#d2949d7a4b889030389e46402289c754be69ffbb"
+  integrity sha512-yCtzWue60qfQd+b16dVUNE8kWCyQHNHUALnrue32M/ZxwH2AXjzjxdzA5YCe48kFlzqIi/tSxOuJa8TkU8Px1g==
   dependencies:
     "@types/chai" "*"
     "@types/lodash" "*"
@@ -3573,10 +3574,10 @@ got@^11:
     p-cancelable "^2.0.0"
     responselike "^2.0.0"
 
-graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.5, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
-  version "4.2.10"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
-  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
+graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.5, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6:
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
 grapheme-splitter@^1.0.4:
   version "1.0.4"
@@ -4303,10 +4304,10 @@ jsesc@^2.5.1:
   resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
-jsforce@^2.0.0-beta.19:
-  version "2.0.0-beta.19"
-  resolved "https://registry.yarnpkg.com/jsforce/-/jsforce-2.0.0-beta.19.tgz#4a136b88d6a9f6668714c4ccbb0acd55e46ea493"
-  integrity sha512-WdF6hs7kukXNGvp/VRhu2DngldgiBBorsc2WA5us08oJGbEIPwn/itqYJWKJ+rfPXepz5JbkWQd48XHGjqmPpw==
+jsforce@^2.0.0-beta.20:
+  version "2.0.0-beta.20"
+  resolved "https://registry.yarnpkg.com/jsforce/-/jsforce-2.0.0-beta.20.tgz#907630942b2ecd653098caa3f87e7710874cb207"
+  integrity sha512-5TpdU0MEUN34M0mSKmBwOMKaI8dllTYF8NzpJn0/9akrwqKEERK6K2jGiMWcs85Vx1HCHEcwU2n+5ij6z6zr2g==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@babel/runtime-corejs3" "^7.12.5"
@@ -6735,7 +6736,7 @@ trim-newlines@^3.0.0:
   resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
   integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
 
-ts-node@^10.0.0, ts-node@^10.7.0, ts-node@^10.8.1:
+ts-node@^10.0.0, ts-node@^10.7.0, ts-node@^10.8.1, ts-node@^10.9.1:
   version "10.9.1"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
   integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
@@ -6774,7 +6775,7 @@ tslib@^1.8.1, tslib@^1.9.0:
   resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.1, tslib@^2.5.0:
+tslib@^2, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1, tslib@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
   integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==

From a44c9db798f3c504ffc80a458f26f14ca7e8aadd Mon Sep 17 00:00:00 2001
From: Peter Hale <peter.hale@salesforce.com>
Date: Tue, 28 Mar 2023 09:38:17 -0600
Subject: [PATCH 02/23] chore: use non throwing functions for defaltHelp

---
 package.json               |  4 ++--
 src/flags/orgApiVersion.ts |  4 ++--
 src/flags/orgFlags.ts      |  6 ++----
 src/flags/salesforceId.ts  |  6 +++---
 yarn.lock                  | 37 ++++++++++++++++++++++++++++++++++++-
 5 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 006a7d3b..e58d35e3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/sf-plugins-core",
-  "version": "2.2.5",
+  "version": "2.2.6-beta.0",
   "description": "Utils for writing Salesforce CLI plugins",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -32,7 +32,7 @@
     "/messages"
   ],
   "dependencies": {
-    "@oclif/core": "^2.7.0",
+    "@oclif/core": "^2.7.2-beta.1",
     "@salesforce/core": "^3.34.4",
     "@salesforce/kit": "^1.9.2",
     "@salesforce/ts-types": "^1.7.3",
diff --git a/src/flags/orgApiVersion.ts b/src/flags/orgApiVersion.ts
index 43781359..4811e284 100644
--- a/src/flags/orgApiVersion.ts
+++ b/src/flags/orgApiVersion.ts
@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import { Flags } from '@oclif/core';
-import { Messages, sfdc, Lifecycle, OrgConfigProperties } from '@salesforce/core';
+import { Messages, Lifecycle, OrgConfigProperties, validateApiVersion } from '@salesforce/core';
 
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/sf-plugins-core', 'messages');
@@ -57,7 +57,7 @@ const getDefaultFromConfig = async (): Promise<string | undefined> => {
 
 const validate = async (input: string): Promise<string> => {
   // basic format check
-  if (!sfdc.validateApiVersion(input)) {
+  if (!validateApiVersion(input)) {
     throw messages.createError('errors.InvalidApiVersion', [input]);
   }
   const requestedVersion = parseInt(input, 10);
diff --git a/src/flags/orgFlags.ts b/src/flags/orgFlags.ts
index e9ad8d16..6c1d6589 100644
--- a/src/flags/orgFlags.ts
+++ b/src/flags/orgFlags.ts
@@ -132,8 +132,7 @@ export const requiredOrgFlag = Flags.custom({
   summary: messages.getMessage('flags.targetOrg.summary'),
   parse: async (input: string | undefined) => getOrgOrThrow(input),
   default: async () => getOrgOrThrow(),
-  defaultHelp: async (_, isWritingManifest) =>
-    !isWritingManifest ? (await getOrgOrThrow())?.getUsername() : undefined,
+  defaultHelp: async (_, isWritingManifest) => (!isWritingManifest ? (await maybeGetOrg())?.getUsername() : undefined),
   required: true,
 });
 
@@ -164,8 +163,7 @@ export const requiredHubFlag = Flags.custom({
   summary: messages.getMessage('flags.targetDevHubOrg.summary'),
   parse: async (input: string | undefined) => getHubOrThrow(input),
   default: async () => getHubOrThrow(),
-  defaultHelp: async (_, isWritingManifest) =>
-    !isWritingManifest ? (await getHubOrThrow())?.getUsername() : undefined,
+  defaultHelp: async (_, isWritingManifest) => (!isWritingManifest ? (await maybeGetHub())?.getUsername() : undefined),
   required: true,
 });
 
diff --git a/src/flags/salesforceId.ts b/src/flags/salesforceId.ts
index adb12473..75e61c27 100644
--- a/src/flags/salesforceId.ts
+++ b/src/flags/salesforceId.ts
@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import { Flags } from '@oclif/core';
-import { Messages, sfdc } from '@salesforce/core';
+import { Messages, validateSalesforceId } from '@salesforce/core';
 
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/sf-plugins-core', 'messages');
@@ -52,14 +52,14 @@ const validate = (input: string, config?: IdFlagConfig): string => {
   const { length, startsWith } = config ?? {};
 
   // If the flag doesn't specify a length or specifies "both", then let it accept both 15 or 18.
-  const allowedIdLength = (!length || length === 'both') ? [15, 18] : [length];
+  const allowedIdLength = !length || length === 'both' ? [15, 18] : [length];
 
   if (!allowedIdLength.includes(input.length)) {
     throw messages.createError('errors.InvalidIdLength', [
       allowedIdLength.join(` ${messages.getMessage('errors.InvalidIdLength.or')} `),
     ]);
   }
-  if (!sfdc.validateSalesforceId(input)) {
+  if (!validateSalesforceId(input)) {
     throw messages.createError('errors.InvalidId');
   }
   if (startsWith && !input.startsWith(startsWith)) {
diff --git a/yarn.lock b/yarn.lock
index 02aea5b9..1b753fb1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -675,7 +675,7 @@
     supports-color "^8.1.1"
     tslib "^2"
 
-"@oclif/core@^2.1.7", "@oclif/core@^2.3.0", "@oclif/core@^2.3.1", "@oclif/core@^2.6.4", "@oclif/core@^2.7.0":
+"@oclif/core@^2.1.7", "@oclif/core@^2.3.0", "@oclif/core@^2.3.1", "@oclif/core@^2.6.4":
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.7.0.tgz#18223631f32d60589d528f3fd5f61832018e5f80"
   integrity sha512-8+qll0gr+if7QxZ5PBxhSFDK67uR62lJvUHTnQ5p1lzapHO/ucwA5YIiSn6LtIsKnP7l0uDINegXb9z8lNM/OQ==
@@ -710,6 +710,41 @@
     wordwrap "^1.0.0"
     wrap-ansi "^7.0.0"
 
+"@oclif/core@^2.7.2-beta.1":
+  version "2.7.2-beta.1"
+  resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.7.2-beta.1.tgz#9c516491181e3e2c263c745285d5a76830357234"
+  integrity sha512-XJFavLXLOii5YkDo43fmyB/1kqcsGd1fAH4iMt0xf8CMPKepUZyc2JmBuGo+Z59Rc8dVwuS2gIuQGQHR+N+V9g==
+  dependencies:
+    "@types/cli-progress" "^3.11.0"
+    ansi-escapes "^4.3.2"
+    ansi-styles "^4.3.0"
+    cardinal "^2.1.1"
+    chalk "^4.1.2"
+    clean-stack "^3.0.1"
+    cli-progress "^3.12.0"
+    debug "^4.3.4"
+    ejs "^3.1.8"
+    fs-extra "^9.1.0"
+    get-package-type "^0.1.0"
+    globby "^11.1.0"
+    hyperlinker "^1.0.0"
+    indent-string "^4.0.0"
+    is-wsl "^2.2.0"
+    js-yaml "^3.14.1"
+    natural-orderby "^2.0.3"
+    object-treeify "^1.1.33"
+    password-prompt "^1.1.2"
+    semver "^7.3.7"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    supports-color "^8.1.1"
+    supports-hyperlinks "^2.2.0"
+    ts-node "^10.9.1"
+    tslib "^2.5.0"
+    widest-line "^3.1.0"
+    wordwrap "^1.0.0"
+    wrap-ansi "^7.0.0"
+
 "@oclif/plugin-help@^5.1.19":
   version "5.2.6"
   resolved "https://registry.yarnpkg.com/@oclif/plugin-help/-/plugin-help-5.2.6.tgz#c3b8f8f7608d1969fa2730c4de5166ea9a4fc952"

From 2d954915510fc32dd935d66d48ff90dda76c40d6 Mon Sep 17 00:00:00 2001
From: Peter Hale <peter.hale@salesforce.com>
Date: Tue, 28 Mar 2023 10:52:27 -0600
Subject: [PATCH 03/23] chore: bumo oclif/core

---
 package.json |  17 +++----
 yarn.lock    | 141 +++++++++++++++++++--------------------------------
 2 files changed, 61 insertions(+), 97 deletions(-)

diff --git a/package.json b/package.json
index 715ce796..333d246c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/sf-plugins-core",
-  "version": "2.2.6-beta.0",
+  "version": "2.2.5",
   "description": "Utils for writing Salesforce CLI plugins",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -32,8 +32,8 @@
     "/messages"
   ],
   "dependencies": {
-    "@oclif/core": "^2.7.2-beta.1",
-    "@salesforce/core": "^3.34.4",
+    "@oclif/core": "^2.8.0",
+    "@salesforce/core": "^3.34.6",
     "@salesforce/kit": "^1.9.2",
     "@salesforce/ts-types": "^1.7.3",
     "chalk": "^4",
@@ -83,7 +83,7 @@
       "command": "tsc -p . --pretty --incremental",
       "files": [
         "src/**/*.ts",
-        "tsconfig.json",
+        "**/tsconfig.json",
         "messages/**"
       ],
       "output": [
@@ -109,7 +109,8 @@
         "src/**/*.ts",
         "test/**/*.ts",
         "messages/**",
-        ".eslint*"
+        "**/.eslint*",
+        "**/tsconfig.json"
       ],
       "output": []
     },
@@ -117,8 +118,7 @@
       "command": "tsc -p \"./test\" --pretty",
       "files": [
         "test/**/*.ts",
-        "tsconfig.json",
-        "test/tsconfig.json"
+        "**/tsconfig.json"
       ],
       "output": []
     },
@@ -136,9 +136,8 @@
       "files": [
         "test/**/*.ts",
         "src/**/*.ts",
-        "tsconfig.json",
+        "**/tsconfig.json",
         ".mocha*",
-        "test/tsconfig.json",
         "!*.nut.ts",
         ".nycrc"
       ],
diff --git a/yarn.lock b/yarn.lock
index 1b753fb1..946fab81 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -675,45 +675,10 @@
     supports-color "^8.1.1"
     tslib "^2"
 
-"@oclif/core@^2.1.7", "@oclif/core@^2.3.0", "@oclif/core@^2.3.1", "@oclif/core@^2.6.4":
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.7.0.tgz#18223631f32d60589d528f3fd5f61832018e5f80"
-  integrity sha512-8+qll0gr+if7QxZ5PBxhSFDK67uR62lJvUHTnQ5p1lzapHO/ucwA5YIiSn6LtIsKnP7l0uDINegXb9z8lNM/OQ==
-  dependencies:
-    "@types/cli-progress" "^3.11.0"
-    ansi-escapes "^4.3.2"
-    ansi-styles "^4.3.0"
-    cardinal "^2.1.1"
-    chalk "^4.1.2"
-    clean-stack "^3.0.1"
-    cli-progress "^3.12.0"
-    debug "^4.3.4"
-    ejs "^3.1.8"
-    fs-extra "^9.1.0"
-    get-package-type "^0.1.0"
-    globby "^11.1.0"
-    hyperlinker "^1.0.0"
-    indent-string "^4.0.0"
-    is-wsl "^2.2.0"
-    js-yaml "^3.14.1"
-    natural-orderby "^2.0.3"
-    object-treeify "^1.1.33"
-    password-prompt "^1.1.2"
-    semver "^7.3.7"
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
-    supports-color "^8.1.1"
-    supports-hyperlinks "^2.2.0"
-    ts-node "^10.9.1"
-    tslib "^2.5.0"
-    widest-line "^3.1.0"
-    wordwrap "^1.0.0"
-    wrap-ansi "^7.0.0"
-
-"@oclif/core@^2.7.2-beta.1":
-  version "2.7.2-beta.1"
-  resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.7.2-beta.1.tgz#9c516491181e3e2c263c745285d5a76830357234"
-  integrity sha512-XJFavLXLOii5YkDo43fmyB/1kqcsGd1fAH4iMt0xf8CMPKepUZyc2JmBuGo+Z59Rc8dVwuS2gIuQGQHR+N+V9g==
+"@oclif/core@^2.1.7", "@oclif/core@^2.3.0", "@oclif/core@^2.3.1", "@oclif/core@^2.6.4", "@oclif/core@^2.8.0":
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.8.0.tgz#4948de3168804169fa68895af8ec4853f332b307"
+  integrity sha512-A2wHItFrD/WOw5bJ6Mtv9MD7If0bsKNR0pwEY0me+fo4HSXlJOtgYGqmzb8t8akX3DUUT7XsjPajsoHLkIJyvg==
   dependencies:
     "@types/cli-progress" "^3.11.0"
     ansi-escapes "^4.3.2"
@@ -896,14 +861,14 @@
     mv "~2"
     safe-json-stringify "~1"
 
-"@salesforce/core@^3.34.4":
-  version "3.34.4"
-  resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-3.34.4.tgz#6fa11c32f14d20130a0c92c5d306f368671ec104"
-  integrity sha512-WasR/6IXKcNj3MgZIcVaT7W5Ic/blxOgpQIzob/7JEsnLVr3pPPb+9/axRvxEGdJr/gOnL1vR0NbBX+Mz6TtkQ==
+"@salesforce/core@^3.34.6":
+  version "3.34.6"
+  resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-3.34.6.tgz#816031d3aab098d56165d876db626a3610d86c6e"
+  integrity sha512-9Nd+bQRSvCYDiZo97bhseajLhr7d51J9gsPUnfN3nHy1/TBQXjN+upRAPAeldvzU8G3L98WGDMtEpSTOG/PxkQ==
   dependencies:
     "@salesforce/bunyan" "^2.0.0"
     "@salesforce/kit" "^1.9.2"
-    "@salesforce/schemas" "^1.5.0"
+    "@salesforce/schemas" "^1.5.1"
     "@salesforce/ts-types" "^1.7.2"
     "@types/graceful-fs" "^4.1.6"
     "@types/semver" "^7.3.13"
@@ -978,10 +943,10 @@
   resolved "https://registry.npmjs.org/@salesforce/prettier-config/-/prettier-config-0.0.2.tgz#ded39bf7cb75238edc9db6dd093649111350f8bc"
   integrity sha512-KExM355BLbxCW6siGBV7oUOotXvvVp0tAWERgzUkM2FcMb9fWrjwXDrIHc8V0UdDlA3UXtFltDWgN+Yqi+BA/g==
 
-"@salesforce/schemas@^1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.5.0.tgz#8bfe2cb5d7cb29d3394b3b9cfb71bb527009c82c"
-  integrity sha512-EKFBURBuON7cj8XZCW+ybeSRRw7wUP1XUXZVHzFgx8KiYmSeGiRHBYbDjQOsQMho2uOLsTozMPEt2ehYnji0YA==
+"@salesforce/schemas@^1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.5.1.tgz#2d1bfdcf593caaa04cd4b3e6fe621097ff7f28fe"
+  integrity sha512-MRqU+tn8w5IFvZ0Lm9YKLgxYxr2MQMI+fXXsTrwfUnijsps+ybF9IOTu6MOMxxl2vCUkO8XDjA435wXlWSLI6g==
 
 "@salesforce/ts-sinon@^1.4.6":
   version "1.4.6"
@@ -1273,14 +1238,14 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@^5.47.0":
-  version "5.47.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.47.0.tgz#62e83de93499bf4b500528f74bf2e0554e3a6c8d"
-  integrity sha512-udPU4ckK+R1JWCGdQC4Qa27NtBg7w020ffHqGyAK8pAgOVuNw7YaKXGChk+udh+iiGIJf6/E/0xhVXyPAbsczw==
+"@typescript-eslint/parser@^5.56.0":
+  version "5.57.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.57.0.tgz#f675bf2cd1a838949fd0de5683834417b757e4fa"
+  integrity sha512-orrduvpWYkgLCyAdNtR1QIWovcNZlEm6yL8nwH/eTxWLd8gsP+25pdLHYzL2QdkqrieaDwLpytHqycncv0woUQ==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.47.0"
-    "@typescript-eslint/types" "5.47.0"
-    "@typescript-eslint/typescript-estree" "5.47.0"
+    "@typescript-eslint/scope-manager" "5.57.0"
+    "@typescript-eslint/types" "5.57.0"
+    "@typescript-eslint/typescript-estree" "5.57.0"
     debug "^4.3.4"
 
 "@typescript-eslint/scope-manager@5.44.0":
@@ -1291,13 +1256,13 @@
     "@typescript-eslint/types" "5.44.0"
     "@typescript-eslint/visitor-keys" "5.44.0"
 
-"@typescript-eslint/scope-manager@5.47.0":
-  version "5.47.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.47.0.tgz#f58144a6b0ff58b996f92172c488813aee9b09df"
-  integrity sha512-dvJab4bFf7JVvjPuh3sfBUWsiD73aiftKBpWSfi3sUkysDQ4W8x+ZcFpNp7Kgv0weldhpmMOZBjx1wKN8uWvAw==
+"@typescript-eslint/scope-manager@5.57.0":
+  version "5.57.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.57.0.tgz#79ccd3fa7bde0758059172d44239e871e087ea36"
+  integrity sha512-NANBNOQvllPlizl9LatX8+MHi7bx7WGIWYjPHDmQe5Si/0YEYfxSljJpoTyTWFTgRy3X8gLYSE4xQ2U+aCozSw==
   dependencies:
-    "@typescript-eslint/types" "5.47.0"
-    "@typescript-eslint/visitor-keys" "5.47.0"
+    "@typescript-eslint/types" "5.57.0"
+    "@typescript-eslint/visitor-keys" "5.57.0"
 
 "@typescript-eslint/type-utils@5.44.0":
   version "5.44.0"
@@ -1314,10 +1279,10 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.44.0.tgz#f3f0b89aaff78f097a2927fe5688c07e786a0241"
   integrity sha512-Tp+zDnHmGk4qKR1l+Y1rBvpjpm5tGXX339eAlRBDg+kgZkz9Bw+pqi4dyseOZMsGuSH69fYfPJCBKBrbPCxYFQ==
 
-"@typescript-eslint/types@5.47.0":
-  version "5.47.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.47.0.tgz#67490def406eaa023dbbd8da42ee0d0c9b5229d3"
-  integrity sha512-eslFG0Qy8wpGzDdYKu58CEr3WLkjwC5Usa6XbuV89ce/yN5RITLe1O8e+WFEuxnfftHiJImkkOBADj58ahRxSg==
+"@typescript-eslint/types@5.57.0":
+  version "5.57.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.57.0.tgz#727bfa2b64c73a4376264379cf1f447998eaa132"
+  integrity sha512-mxsod+aZRSyLT+jiqHw1KK6xrANm19/+VFALVFP5qa/aiJnlP38qpyaTd0fEKhWvQk6YeNZ5LGwI1pDpBRBhtQ==
 
 "@typescript-eslint/typescript-estree@5.44.0":
   version "5.44.0"
@@ -1332,13 +1297,13 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/typescript-estree@5.47.0":
-  version "5.47.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.47.0.tgz#ed971a11c5c928646d6ba7fc9dfdd6e997649aca"
-  integrity sha512-LxfKCG4bsRGq60Sqqu+34QT5qT2TEAHvSCCJ321uBWywgE2dS0LKcu5u+3sMGo+Vy9UmLOhdTw5JHzePV/1y4Q==
+"@typescript-eslint/typescript-estree@5.57.0":
+  version "5.57.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.57.0.tgz#ebcd0ee3e1d6230e888d88cddf654252d41e2e40"
+  integrity sha512-LTzQ23TV82KpO8HPnWuxM2V7ieXW8O142I7hQTxWIHDcCEIjtkat6H96PFkYBQqGFLW/G/eVVOB9Z8rcvdY/Vw==
   dependencies:
-    "@typescript-eslint/types" "5.47.0"
-    "@typescript-eslint/visitor-keys" "5.47.0"
+    "@typescript-eslint/types" "5.57.0"
+    "@typescript-eslint/visitor-keys" "5.57.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
@@ -1367,12 +1332,12 @@
     "@typescript-eslint/types" "5.44.0"
     eslint-visitor-keys "^3.3.0"
 
-"@typescript-eslint/visitor-keys@5.47.0":
-  version "5.47.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.47.0.tgz#4aca4efbdf6209c154df1f7599852d571b80bb45"
-  integrity sha512-ByPi5iMa6QqDXe/GmT/hR6MZtVPi0SqMQPDx15FczCBXJo/7M8T88xReOALAfpBLm+zxpPfmhuEvPb577JRAEg==
+"@typescript-eslint/visitor-keys@5.57.0":
+  version "5.57.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.57.0.tgz#e2b2f4174aff1d15eef887ce3d019ecc2d7a8ac1"
+  integrity sha512-ery2g3k0hv5BLiKpPuwYt9KBkAp2ugT6VvyShXdLOkax895EC55sP0Tx5L0fZaQueiK3fBLvHVvEl3jFS5ia+g==
   dependencies:
-    "@typescript-eslint/types" "5.47.0"
+    "@typescript-eslint/types" "5.57.0"
     eslint-visitor-keys "^3.3.0"
 
 "@ungap/promise-all-settled@1.1.2":
@@ -2823,10 +2788,10 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
-eslint-config-prettier@^8.5.0, eslint-config-prettier@^8.6.0:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz#dec1d29ab728f4fa63061774e1672ac4e363d207"
-  integrity sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==
+eslint-config-prettier@^8.5.0, eslint-config-prettier@^8.8.0:
+  version "8.8.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz#bfda738d412adc917fd7b038857110efe98c9348"
+  integrity sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==
 
 eslint-config-salesforce-license@^0.1.6:
   version "0.1.6"
@@ -2843,10 +2808,10 @@ eslint-config-salesforce-typescript@^1.1.1:
   resolved "https://registry.yarnpkg.com/eslint-config-salesforce-typescript/-/eslint-config-salesforce-typescript-1.1.1.tgz#fb038f6423c5472d6439e9f780184b00ebcd2685"
   integrity sha512-cjj2tU5wkushOUynecjg0JQtb/y61pWSjtOKKnNzWEdtbZEs7pe1/w5hsaZ79urdeFFUHQW2mr3qpzsWzUjgxQ==
 
-eslint-config-salesforce@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-salesforce/-/eslint-config-salesforce-1.1.0.tgz#8f33e7cacd417f202727ae8e2b2fab27a81c0dc7"
-  integrity sha512-83foPo1Z8QoKc+APlZ7lN4uSRx4o2uicFMumi8n68Fx1/vPmBBMx86m15lOmEsAY7Gv97DneInVRotlc4+JaQw==
+eslint-config-salesforce@^1.1.0, eslint-config-salesforce@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-config-salesforce/-/eslint-config-salesforce-1.1.1.tgz#0d25735324675cae3fefcbc4e6021aa2c77ea12f"
+  integrity sha512-xDp5ucbmSOAemFHOmzhli5RL864RoAghq/Yf5HeLvNz2JsrUvgW8n97LeZAJxlhj82JqKRg87IEHERUE4BRVPg==
 
 eslint-import-resolver-node@^0.3.6, eslint-import-resolver-node@^0.3.7:
   version "0.3.7"
@@ -5757,10 +5722,10 @@ prelude-ls@^1.2.1:
   resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-prettier@^2.7.1, prettier@^2.8.4:
-  version "2.8.4"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.4.tgz#34dd2595629bfbb79d344ac4a91ff948694463c3"
-  integrity sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==
+prettier@^2.7.1, prettier@^2.8.7:
+  version "2.8.7"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.7.tgz#bb79fc8729308549d28fe3a98fce73d2c0656450"
+  integrity sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==
 
 pretty-bytes@^5.3.0:
   version "5.6.0"

From 9919b734e0414fd65a569057955f5e8170a82cb5 Mon Sep 17 00:00:00 2001
From: Peter Hale <peter.hale@salesforce.com>
Date: Tue, 28 Mar 2023 10:54:06 -0600
Subject: [PATCH 04/23] chore: bump other deps

---
 package.json |   6 +--
 yarn.lock    | 150 +++++++++++++++++----------------------------------
 2 files changed, 53 insertions(+), 103 deletions(-)

diff --git a/package.json b/package.json
index 333d246c..12e9414d 100644
--- a/package.json
+++ b/package.json
@@ -40,13 +40,13 @@
     "inquirer": "^8.2.5"
   },
   "devDependencies": {
-    "@oclif/test": "^2.3.11",
+    "@oclif/test": "^2.3.13",
     "@salesforce/dev-config": "^3.1.0",
     "@salesforce/dev-scripts": "^4.1.3",
     "@salesforce/prettier-config": "^0.0.2",
     "@salesforce/ts-sinon": "^1.4.6",
     "@types/inquirer": "^8.2.3",
-    "@typescript-eslint/eslint-plugin": "^5.44.0",
+    "@typescript-eslint/eslint-plugin": "^5.57.0",
     "@typescript-eslint/parser": "^5.56.0",
     "chai": "^4.3.7",
     "eslint": "^8.36.0",
@@ -56,7 +56,7 @@
     "eslint-config-salesforce-typescript": "^1.1.1",
     "eslint-plugin-header": "^3.1.1",
     "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-jsdoc": "^40.0.0",
+    "eslint-plugin-jsdoc": "^40.1.0",
     "husky": "^7.0.4",
     "mocha": "^9.1.3",
     "nyc": "^15.1.0",
diff --git a/yarn.lock b/yarn.lock
index 946fab81..48c2db5e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -393,14 +393,14 @@
     esquery "^1.4.0"
     jsdoc-type-pratt-parser "1.0.4"
 
-"@es-joy/jsdoccomment@~0.36.1":
-  version "0.36.1"
-  resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.36.1.tgz#c37db40da36e4b848da5fd427a74bae3b004a30f"
-  integrity sha512-922xqFsTpHs6D0BUiG4toiyPOMc8/jafnWKxz1KWgS4XzKPy2qXf1Pe6UFuNSCQqt6tOuhAWXBNuuyUhJmw9Vg==
+"@es-joy/jsdoccomment@~0.37.0":
+  version "0.37.0"
+  resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.37.0.tgz#aaafb4bb6c88288aa7899aef0f3b1b851c36f908"
+  integrity sha512-hjK0wnsPCYLlF+HHB4R/RbUjOWeLW2SlarB67+Do5WsKILOkmIZvvPJFbtWSmbypxcjpoECLAMzoao0D4Bg5ZQ==
   dependencies:
     comment-parser "1.3.1"
     esquery "^1.4.0"
-    jsdoc-type-pratt-parser "~3.1.0"
+    jsdoc-type-pratt-parser "~4.0.0"
 
 "@eslint-community/eslint-utils@^4.2.0":
   version "4.2.0"
@@ -675,7 +675,7 @@
     supports-color "^8.1.1"
     tslib "^2"
 
-"@oclif/core@^2.1.7", "@oclif/core@^2.3.0", "@oclif/core@^2.3.1", "@oclif/core@^2.6.4", "@oclif/core@^2.8.0":
+"@oclif/core@^2.1.7", "@oclif/core@^2.3.0", "@oclif/core@^2.3.1", "@oclif/core@^2.7.1", "@oclif/core@^2.8.0":
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.8.0.tgz#4948de3168804169fa68895af8ec4853f332b307"
   integrity sha512-A2wHItFrD/WOw5bJ6Mtv9MD7If0bsKNR0pwEY0me+fo4HSXlJOtgYGqmzb8t8akX3DUUT7XsjPajsoHLkIJyvg==
@@ -740,13 +740,13 @@
     lodash "^4.17.21"
     semver "^7.3.8"
 
-"@oclif/test@^2.3.11":
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/@oclif/test/-/test-2.3.11.tgz#efb268b2313bfe89c0ceee08497cbca8fc8f7b3d"
-  integrity sha512-QZGhAla1+lfXGJfzB/7yMs1rtdjmHFuu9prBxuT6yHKXTIdi5vwqDZKKzlZzJhtNLe+37ub/Z7uk0zT7dXbhBA==
+"@oclif/test@^2.3.13":
+  version "2.3.13"
+  resolved "https://registry.yarnpkg.com/@oclif/test/-/test-2.3.13.tgz#1f12c3304fe409d6fa6a989741d0d1b89bbba934"
+  integrity sha512-CD3qRj4pwEiRA2GGNr9sLL9iu4ASKJFBxUEk4/qsgPLGY6roMubRwKQTQI9orZ+9F21PdVM7xlNLeVsrpXqA9w==
   dependencies:
-    "@oclif/core" "^2.6.4"
-    fancy-test "^2.0.13"
+    "@oclif/core" "^2.7.1"
+    fancy-test "^2.0.16"
 
 "@octokit/auth-token@^2.4.4":
   version "2.5.0"
@@ -1223,18 +1223,19 @@
     "@types/expect" "^1.20.4"
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@^5.44.0":
-  version "5.44.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.44.0.tgz#105788f299050c917eb85c4d9fd04b089e3740de"
-  integrity sha512-j5ULd7FmmekcyWeArx+i8x7sdRHzAtXTkmDPthE4amxZOWKFK7bomoJ4r7PJ8K7PoMzD16U8MmuZFAonr1ERvw==
+"@typescript-eslint/eslint-plugin@^5.57.0":
+  version "5.57.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.57.0.tgz#52c8a7a4512f10e7249ca1e2e61f81c62c34365c"
+  integrity sha512-itag0qpN6q2UMM6Xgk6xoHa0D0/P+M17THnr4SVgqn9Rgam5k/He33MA7/D7QoJcdMxHFyX7U9imaBonAX/6qA==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.44.0"
-    "@typescript-eslint/type-utils" "5.44.0"
-    "@typescript-eslint/utils" "5.44.0"
+    "@eslint-community/regexpp" "^4.4.0"
+    "@typescript-eslint/scope-manager" "5.57.0"
+    "@typescript-eslint/type-utils" "5.57.0"
+    "@typescript-eslint/utils" "5.57.0"
     debug "^4.3.4"
+    grapheme-splitter "^1.0.4"
     ignore "^5.2.0"
     natural-compare-lite "^1.4.0"
-    regexpp "^3.2.0"
     semver "^7.3.7"
     tsutils "^3.21.0"
 
@@ -1248,14 +1249,6 @@
     "@typescript-eslint/typescript-estree" "5.57.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.44.0":
-  version "5.44.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.44.0.tgz#988c3f34b45b3474eb9ff0674c18309dedfc3e04"
-  integrity sha512-2pKml57KusI0LAhgLKae9kwWeITZ7IsZs77YxyNyIVOwQ1kToyXRaJLl+uDEXzMN5hnobKUOo2gKntK9H1YL8g==
-  dependencies:
-    "@typescript-eslint/types" "5.44.0"
-    "@typescript-eslint/visitor-keys" "5.44.0"
-
 "@typescript-eslint/scope-manager@5.57.0":
   version "5.57.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.57.0.tgz#79ccd3fa7bde0758059172d44239e871e087ea36"
@@ -1264,39 +1257,21 @@
     "@typescript-eslint/types" "5.57.0"
     "@typescript-eslint/visitor-keys" "5.57.0"
 
-"@typescript-eslint/type-utils@5.44.0":
-  version "5.44.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.44.0.tgz#bc5a6e8a0269850714a870c9268c038150dfb3c7"
-  integrity sha512-A1u0Yo5wZxkXPQ7/noGkRhV4J9opcymcr31XQtOzcc5nO/IHN2E2TPMECKWYpM3e6olWEM63fq/BaL1wEYnt/w==
+"@typescript-eslint/type-utils@5.57.0":
+  version "5.57.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.57.0.tgz#98e7531c4e927855d45bd362de922a619b4319f2"
+  integrity sha512-kxXoq9zOTbvqzLbdNKy1yFrxLC6GDJFE2Yuo3KqSwTmDOFjUGeWSakgoXT864WcK5/NAJkkONCiKb1ddsqhLXQ==
   dependencies:
-    "@typescript-eslint/typescript-estree" "5.44.0"
-    "@typescript-eslint/utils" "5.44.0"
+    "@typescript-eslint/typescript-estree" "5.57.0"
+    "@typescript-eslint/utils" "5.57.0"
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.44.0":
-  version "5.44.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.44.0.tgz#f3f0b89aaff78f097a2927fe5688c07e786a0241"
-  integrity sha512-Tp+zDnHmGk4qKR1l+Y1rBvpjpm5tGXX339eAlRBDg+kgZkz9Bw+pqi4dyseOZMsGuSH69fYfPJCBKBrbPCxYFQ==
-
 "@typescript-eslint/types@5.57.0":
   version "5.57.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.57.0.tgz#727bfa2b64c73a4376264379cf1f447998eaa132"
   integrity sha512-mxsod+aZRSyLT+jiqHw1KK6xrANm19/+VFALVFP5qa/aiJnlP38qpyaTd0fEKhWvQk6YeNZ5LGwI1pDpBRBhtQ==
 
-"@typescript-eslint/typescript-estree@5.44.0":
-  version "5.44.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.44.0.tgz#0461b386203e8d383bb1268b1ed1da9bc905b045"
-  integrity sha512-M6Jr+RM7M5zeRj2maSfsZK2660HKAJawv4Ud0xT+yauyvgrsHu276VtXlKDFnEmhG+nVEd0fYZNXGoAgxwDWJw==
-  dependencies:
-    "@typescript-eslint/types" "5.44.0"
-    "@typescript-eslint/visitor-keys" "5.44.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
 "@typescript-eslint/typescript-estree@5.57.0":
   version "5.57.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.57.0.tgz#ebcd0ee3e1d6230e888d88cddf654252d41e2e40"
@@ -1310,28 +1285,20 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.44.0":
-  version "5.44.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.44.0.tgz#d733da4d79d6c30f1a68b531cdda1e0c1f00d52d"
-  integrity sha512-fMzA8LLQ189gaBjS0MZszw5HBdZgVwxVFShCO3QN+ws3GlPkcy9YuS3U4wkT6su0w+Byjq3mS3uamy9HE4Yfjw==
+"@typescript-eslint/utils@5.57.0":
+  version "5.57.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.57.0.tgz#eab8f6563a2ac31f60f3e7024b91bf75f43ecef6"
+  integrity sha512-ps/4WohXV7C+LTSgAL5CApxvxbMkl9B9AUZRtnEFonpIxZDIT7wC1xfvuJONMidrkB9scs4zhtRyIwHh4+18kw==
   dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
     "@types/json-schema" "^7.0.9"
     "@types/semver" "^7.3.12"
-    "@typescript-eslint/scope-manager" "5.44.0"
-    "@typescript-eslint/types" "5.44.0"
-    "@typescript-eslint/typescript-estree" "5.44.0"
+    "@typescript-eslint/scope-manager" "5.57.0"
+    "@typescript-eslint/types" "5.57.0"
+    "@typescript-eslint/typescript-estree" "5.57.0"
     eslint-scope "^5.1.1"
-    eslint-utils "^3.0.0"
     semver "^7.3.7"
 
-"@typescript-eslint/visitor-keys@5.44.0":
-  version "5.44.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.44.0.tgz#10740dc28902bb903d12ee3a005cc3a70207d433"
-  integrity sha512-a48tLG8/4m62gPFbJ27FxwCOqPKxsb8KC3HkmYoq2As/4YyjQl1jDbRr1s63+g4FS/iIehjmN3L5UjmKva1HzQ==
-  dependencies:
-    "@typescript-eslint/types" "5.44.0"
-    eslint-visitor-keys "^3.3.0"
-
 "@typescript-eslint/visitor-keys@5.57.0":
   version "5.57.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.57.0.tgz#e2b2f4174aff1d15eef887ce3d019ecc2d7a8ac1"
@@ -2889,16 +2856,16 @@ eslint-plugin-jsdoc@^35.1.2:
     semver "^7.3.5"
     spdx-expression-parse "^3.0.1"
 
-eslint-plugin-jsdoc@^40.0.0:
-  version "40.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-40.0.0.tgz#7f433757aa91721e4b88a527dc17ac0437c3c075"
-  integrity sha512-LOPyIu1vAVvGPkye3ci0moj0iNf3f8bmin6do2DYDj+77NRXWnkmhKRy8swWsatUs3mB5jYPWPUsFg9pyfEiyA==
+eslint-plugin-jsdoc@^40.1.0:
+  version "40.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-40.1.0.tgz#fec2f649a60167fa5a94f05ce2c6c041caaab129"
+  integrity sha512-ANvrhiu62VlSorARM0hup60VQsS3hNyp0Ca7cnJDj8tpJzM7tNhBVqMVYXSuLzEmqrpwx6aAh+NAN2DdAGG5fQ==
   dependencies:
-    "@es-joy/jsdoccomment" "~0.36.1"
+    "@es-joy/jsdoccomment" "~0.37.0"
     comment-parser "1.3.1"
     debug "^4.3.4"
     escape-string-regexp "^4.0.0"
-    esquery "^1.4.0"
+    esquery "^1.5.0"
     semver "^7.3.8"
     spdx-expression-parse "^3.0.1"
 
@@ -2923,18 +2890,6 @@ eslint-scope@^7.1.1:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
-eslint-utils@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
-  integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
-  dependencies:
-    eslint-visitor-keys "^2.0.0"
-
-eslint-visitor-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
-  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
-
 eslint-visitor-keys@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
@@ -3000,7 +2955,7 @@ esprima@^4.0.0, esprima@~4.0.0:
   resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.4.0, esquery@^1.4.2:
+esquery@^1.4.0, esquery@^1.4.2, esquery@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
   integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
@@ -3088,10 +3043,10 @@ external-editor@^3.0.3:
     iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
-fancy-test@^2.0.13:
-  version "2.0.15"
-  resolved "https://registry.yarnpkg.com/fancy-test/-/fancy-test-2.0.15.tgz#d2949d7a4b889030389e46402289c754be69ffbb"
-  integrity sha512-yCtzWue60qfQd+b16dVUNE8kWCyQHNHUALnrue32M/ZxwH2AXjzjxdzA5YCe48kFlzqIi/tSxOuJa8TkU8Px1g==
+fancy-test@^2.0.16:
+  version "2.0.16"
+  resolved "https://registry.yarnpkg.com/fancy-test/-/fancy-test-2.0.16.tgz#fbeb22f1f6b790b067fc774873093d0ca4fc98c1"
+  integrity sha512-Bgsd32hr+Ohrh/D4zACMstWjViYR6IHJxzvhLSzbekNIrDWOwSHx7zvKtrN/pFrFVyNBo02kNdz3PyPD5W2ibQ==
   dependencies:
     "@types/chai" "*"
     "@types/lodash" "*"
@@ -4294,10 +4249,10 @@ jsdoc-type-pratt-parser@1.0.4, jsdoc-type-pratt-parser@^1.0.4:
   resolved "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.0.4.tgz#5750d2d32ffb001866537d3baaedea7cf84c7036"
   integrity sha512-jzmW9gokeq9+bHPDR1nCeidMyFUikdZlbOhKzh9+/nJqB75XhpNKec1/UuxW5c4+O+Pi31Gc/dCboyfSm/pSpQ==
 
-jsdoc-type-pratt-parser@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-3.1.0.tgz#a4a56bdc6e82e5865ffd9febc5b1a227ff28e67e"
-  integrity sha512-MgtD0ZiCDk9B+eI73BextfRrVQl0oyzRG8B2BjORts6jbunj4ScKPcyXGTbB6eXL4y9TzxCm6hyeLq/2ASzNdw==
+jsdoc-type-pratt-parser@~4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz#136f0571a99c184d84ec84662c45c29ceff71114"
+  integrity sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==
 
 jsesc@^2.5.1:
   version "2.5.2"
@@ -5972,11 +5927,6 @@ regexp.prototype.flags@^1.4.3:
     define-properties "^1.1.3"
     functions-have-names "^1.2.2"
 
-regexpp@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
-  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
-
 regextras@^0.8.0:
   version "0.8.0"
   resolved "https://registry.npmjs.org/regextras/-/regextras-0.8.0.tgz#ec0f99853d4912839321172f608b544814b02217"

From 273c9bed2fec13f8fc77dc3cde925f73c685cca0 Mon Sep 17 00:00:00 2001
From: Peter Hale <peter.hale@salesforce.com>
Date: Tue, 28 Mar 2023 11:17:04 -0600
Subject: [PATCH 05/23] chore: enable strict null checks for tests

---
 test/tsconfig.json               |  2 +-
 test/unit/flags/duration.test.ts | 18 +++++++++---------
 test/unit/flags/orgFlags.test.ts |  4 ++--
 test/unit/sfCommand.test.ts      |  8 ++++++--
 test/unit/util.test.ts           | 18 +++++++++---------
 5 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/test/tsconfig.json b/test/tsconfig.json
index 080eed37..270e87bc 100644
--- a/test/tsconfig.json
+++ b/test/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../node_modules/@salesforce/dev-config/tsconfig",
+  "extends": "@salesforce/dev-config/tsconfig-test-strict",
   "include": ["unit/**/*.ts", "../node_modules/@types/**/*.d.ts"],
   "compilerOptions": {
     "noEmit": true,
diff --git a/test/unit/flags/duration.test.ts b/test/unit/flags/duration.test.ts
index 26f3f3d5..7490ddf5 100644
--- a/test/unit/flags/duration.test.ts
+++ b/test/unit/flags/duration.test.ts
@@ -27,8 +27,8 @@ describe('duration flag', () => {
     };
     it('passes', async () => {
       const out = await Parser.parse(['--wait=10'], buildProps);
-      expect(out.flags.wait.quantity).to.equal(10);
-      expect(out.flags.wait.unit).to.equal(Duration.Unit.HOURS);
+      expect(out.flags.wait?.quantity).to.equal(10);
+      expect(out.flags.wait?.unit).to.equal(Duration.Unit.HOURS);
     });
     it('passes with default', async () => {
       const out = await Parser.parse([], buildProps);
@@ -50,12 +50,12 @@ describe('duration flag', () => {
     };
     it('passes', async () => {
       const out = await Parser.parse(['--wait=10'], buildProps);
-      expect(out.flags.wait.quantity).to.equal(10);
-      expect(out.flags.wait.unit).to.equal(Duration.Unit.WEEKS);
+      expect(out.flags.wait?.quantity).to.equal(10);
+      expect(out.flags.wait?.unit).to.equal(Duration.Unit.WEEKS);
     });
     it('passes with default', async () => {
       const out = await Parser.parse([], buildProps);
-      expect(out.flags.wait.quantity).to.equal(33);
+      expect(out.flags.wait?.quantity).to.equal(33);
     });
   });
 
@@ -77,19 +77,19 @@ describe('duration flag', () => {
     };
     it('passes', async () => {
       const out = await Parser.parse(['--wait=10'], buildProps);
-      expect(out.flags.wait.quantity).to.equal(10);
+      expect(out.flags.wait?.quantity).to.equal(10);
     });
     it('min passes', async () => {
       const out = await Parser.parse([`--wait=${min}`], buildProps);
-      expect(out.flags.wait.quantity).to.equal(min);
+      expect(out.flags.wait?.quantity).to.equal(min);
     });
     it('max passes', async () => {
       const out = await Parser.parse([`--wait=${max}`], buildProps);
-      expect(out.flags.wait.quantity).to.equal(max);
+      expect(out.flags.wait?.quantity).to.equal(max);
     });
     it('default works', async () => {
       const out = await Parser.parse([], buildProps);
-      expect(out.flags.wait.quantity).to.equal(defaultValue);
+      expect(out.flags.wait?.quantity).to.equal(defaultValue);
     });
     describe('failures', () => {
       it('below min fails', async () => {
diff --git a/test/unit/flags/orgFlags.test.ts b/test/unit/flags/orgFlags.test.ts
index 8d3b75c7..fceec24f 100644
--- a/test/unit/flags/orgFlags.test.ts
+++ b/test/unit/flags/orgFlags.test.ts
@@ -144,8 +144,8 @@ describe('org flags', () => {
     it('no input, uses default', async () => {
       await $$.stubConfig({ [OrgConfigProperties.TARGET_DEV_HUB]: testHub.username });
       const retrieved = await maybeGetHub();
-      expect(retrieved).to.be.instanceOf(Org);
-      expect(retrieved.getOrgId()).to.equal(testHub.orgId);
+      assert(retrieved instanceof Org);
+      expect(retrieved?.getOrgId()).to.equal(testHub.orgId);
     });
     it('no input, uses default but is not a hub => throw', async () => {
       await $$.stubConfig({ [OrgConfigProperties.TARGET_DEV_HUB]: testOrg.username });
diff --git a/test/unit/sfCommand.test.ts b/test/unit/sfCommand.test.ts
index cbf41bed..b5a9c4fb 100644
--- a/test/unit/sfCommand.test.ts
+++ b/test/unit/sfCommand.test.ts
@@ -23,11 +23,15 @@ class TestCommand extends SfCommand<void> {
     const { flags } = await this.parse(TestCommand);
 
     if (flags.error && !flags.warn) {
-      const infoError = new SfError('foo bar baz', 'FooError', flags.actions ? ['this', 'is an', 'action'] : null);
+      const infoError = new SfError('foo bar baz', 'FooError', flags.actions ? ['this', 'is an', 'action'] : undefined);
       this.info(infoError);
     } else if (flags.warn) {
       if (flags.error) {
-        const warnError = new SfError('foo bar baz', 'FooError', flags.actions ? ['this', 'is an', 'action'] : null);
+        const warnError = new SfError(
+          'foo bar baz',
+          'FooError',
+          flags.actions ? ['this', 'is an', 'action'] : undefined
+        );
         this.warn(warnError);
       } else {
         this.warn('foo bar baz');
diff --git a/test/unit/util.test.ts b/test/unit/util.test.ts
index 02f0a539..afa4d61f 100644
--- a/test/unit/util.test.ts
+++ b/test/unit/util.test.ts
@@ -21,7 +21,7 @@ describe('toHelpSection', () => {
     const envVarSection = toHelpSection('ENV VAR SECTION', EnvironmentVariable.SFDX_ACCESS_TOKEN);
     expect(envVarSection).to.have.property('header', 'ENV VAR SECTION');
     expect(envVarSection).to.have.property('body').to.have.property('length', 1);
-    expect(envVarSection.body[0]).to.deep.equal({
+    expect(envVarSection?.body?.[0]).to.deep.equal({
       name: 'SFDX_ACCESS_TOKEN',
       description: SUPPORTED_ENV_VARS[EnvironmentVariable.SFDX_ACCESS_TOKEN].description,
     });
@@ -32,9 +32,9 @@ describe('toHelpSection', () => {
     expect(orgConfigSection).to.have.property('header', 'ORG CONFIG VAR SECTION');
     expect(orgConfigSection).to.have.property('body').to.have.property('length', 1);
     const orgConfig = ORG_CONFIG_ALLOWED_PROPERTIES.find(({ key }) => key === OrgConfigProperties.TARGET_ORG);
-    expect(orgConfigSection.body[0]).to.deep.equal({
+    expect(orgConfigSection?.body?.[0]).to.deep.equal({
       name: 'target-org',
-      description: orgConfig.description,
+      description: orgConfig?.description,
     });
   });
 
@@ -43,9 +43,9 @@ describe('toHelpSection', () => {
     expect(sfdxConfigSection).to.have.property('header', 'SFDX CONFIG VAR SECTION');
     expect(sfdxConfigSection).to.have.property('body').to.have.property('length', 1);
     const sfdxConfig = SFDX_ALLOWED_PROPERTIES.find(({ key }) => key === SfdxPropertyKeys.INSTANCE_URL);
-    expect(sfdxConfigSection.body[0]).to.deep.equal({
+    expect(sfdxConfigSection?.body?.[0]).to.deep.equal({
       name: 'instanceUrl',
-      description: sfdxConfig.description,
+      description: sfdxConfig?.description,
     });
   });
 
@@ -60,18 +60,18 @@ describe('toHelpSection', () => {
     expect(mixedSection).to.have.property('body').to.have.property('length', 3);
     const sfdxConfig = SFDX_ALLOWED_PROPERTIES.find(({ key }) => key === SfdxPropertyKeys.INSTANCE_URL);
     const orgConfig = ORG_CONFIG_ALLOWED_PROPERTIES.find(({ key }) => key === OrgConfigProperties.TARGET_ORG);
-    expect(mixedSection.body).to.deep.equal([
+    expect(mixedSection?.body).to.deep.equal([
       {
         name: 'SFDX_ACCESS_TOKEN',
         description: SUPPORTED_ENV_VARS[EnvironmentVariable.SFDX_ACCESS_TOKEN].description,
       },
       {
         name: 'target-org',
-        description: orgConfig.description,
+        description: orgConfig?.description,
       },
       {
         name: 'instanceUrl',
-        description: sfdxConfig.description,
+        description: sfdxConfig?.description,
       },
     ]);
   });
@@ -80,7 +80,7 @@ describe('toHelpSection', () => {
     const envVarSection = toHelpSection('ARBITRARY SECTION', { 'foo bar': 'hello world' });
     expect(envVarSection).to.have.property('header', 'ARBITRARY SECTION');
     expect(envVarSection).to.have.property('body').to.have.property('length', 1);
-    expect(envVarSection.body[0]).to.deep.equal({
+    expect(envVarSection?.body?.[0]).to.deep.equal({
       name: 'foo bar',
       description: 'hello world',
     });

From dc8649b630dbacd92250b19ca9f206bb6aa6dd60 Mon Sep 17 00:00:00 2001
From: Peter Hale <peter.hale@salesforce.com>
Date: Wed, 29 Mar 2023 08:40:27 -0600
Subject: [PATCH 06/23] chore: better solution

---
 package.json          |  4 ++--
 src/flags/orgFlags.ts | 40 ++++++++++++++++++++++++++++++++++++----
 yarn.lock             | 37 ++++++++++++++++++++++++++++++++++++-
 3 files changed, 74 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 12e9414d..05d30f79 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/sf-plugins-core",
-  "version": "2.2.5",
+  "version": "2.2.6-beta.1",
   "description": "Utils for writing Salesforce CLI plugins",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -32,7 +32,7 @@
     "/messages"
   ],
   "dependencies": {
-    "@oclif/core": "^2.8.0",
+    "@oclif/core": "^2.8.1-beta.1",
     "@salesforce/core": "^3.34.6",
     "@salesforce/kit": "^1.9.2",
     "@salesforce/ts-types": "^1.7.3",
diff --git a/src/flags/orgFlags.ts b/src/flags/orgFlags.ts
index 6c1d6589..e4edd730 100644
--- a/src/flags/orgFlags.ts
+++ b/src/flags/orgFlags.ts
@@ -102,7 +102,15 @@ export const optionalOrgFlag = Flags.custom({
   char: 'o',
   parse: async (input: string | undefined) => maybeGetOrg(input),
   default: async () => maybeGetOrg(),
-  defaultHelp: async (_, isWritingManifest) => (!isWritingManifest ? (await maybeGetOrg())?.getUsername() : undefined),
+  defaultHelp: async (context, isWritingManifest) => {
+    if (isWritingManifest) {
+      return undefined;
+    }
+    if (context.flags instanceof Org) {
+      return context.flags.getUsername();
+    }
+    return (await maybeGetOrg())?.getUsername();
+  },
 });
 
 /**
@@ -132,7 +140,15 @@ export const requiredOrgFlag = Flags.custom({
   summary: messages.getMessage('flags.targetOrg.summary'),
   parse: async (input: string | undefined) => getOrgOrThrow(input),
   default: async () => getOrgOrThrow(),
-  defaultHelp: async (_, isWritingManifest) => (!isWritingManifest ? (await maybeGetOrg())?.getUsername() : undefined),
+  defaultHelp: async (context, isWritingManifest) => {
+    if (isWritingManifest) {
+      return undefined;
+    }
+    if (context.flags instanceof Org) {
+      return context.flags.getUsername();
+    }
+    return (await maybeGetOrg())?.getUsername();
+  },
   required: true,
 });
 
@@ -163,7 +179,15 @@ export const requiredHubFlag = Flags.custom({
   summary: messages.getMessage('flags.targetDevHubOrg.summary'),
   parse: async (input: string | undefined) => getHubOrThrow(input),
   default: async () => getHubOrThrow(),
-  defaultHelp: async (_, isWritingManifest) => (!isWritingManifest ? (await maybeGetHub())?.getUsername() : undefined),
+  defaultHelp: async (context, isWritingManifest) => {
+    if (isWritingManifest) {
+      return undefined;
+    }
+    if (context.flags instanceof Org) {
+      return context.flags.getUsername();
+    }
+    return (await maybeGetHub())?.getUsername();
+  },
   required: true,
 });
 
@@ -193,6 +217,14 @@ export const optionalHubFlag = Flags.custom({
   summary: messages.getMessage('flags.targetDevHubOrg.summary'),
   parse: async (input: string | undefined) => maybeGetHub(input),
   default: async () => maybeGetHub(),
-  defaultHelp: async (_, isWritingManifest) => (!isWritingManifest ? (await maybeGetHub())?.getUsername() : undefined),
+  defaultHelp: async (context, isWritingManifest) => {
+    if (isWritingManifest) {
+      return undefined;
+    }
+    if (context.flags instanceof Org) {
+      return context.flags.getUsername();
+    }
+    return (await maybeGetHub())?.getUsername();
+  },
   required: false,
 });
diff --git a/yarn.lock b/yarn.lock
index 48c2db5e..163332ca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -675,7 +675,7 @@
     supports-color "^8.1.1"
     tslib "^2"
 
-"@oclif/core@^2.1.7", "@oclif/core@^2.3.0", "@oclif/core@^2.3.1", "@oclif/core@^2.7.1", "@oclif/core@^2.8.0":
+"@oclif/core@^2.1.7", "@oclif/core@^2.3.0", "@oclif/core@^2.3.1", "@oclif/core@^2.7.1":
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.8.0.tgz#4948de3168804169fa68895af8ec4853f332b307"
   integrity sha512-A2wHItFrD/WOw5bJ6Mtv9MD7If0bsKNR0pwEY0me+fo4HSXlJOtgYGqmzb8t8akX3DUUT7XsjPajsoHLkIJyvg==
@@ -710,6 +710,41 @@
     wordwrap "^1.0.0"
     wrap-ansi "^7.0.0"
 
+"@oclif/core@^2.8.1-beta.1":
+  version "2.8.1-beta.1"
+  resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.8.1-beta.1.tgz#fcb23978df884b568d9d00f0ea764d28303ef5d3"
+  integrity sha512-5FPjy27z0z75nIETTaezIGAcrDCJEn0Cjcu5Sg5jW4wtzM3buAuPpHjm+Yj6LSDtQVyw1If6aQx36Hh9MnnsBA==
+  dependencies:
+    "@types/cli-progress" "^3.11.0"
+    ansi-escapes "^4.3.2"
+    ansi-styles "^4.3.0"
+    cardinal "^2.1.1"
+    chalk "^4.1.2"
+    clean-stack "^3.0.1"
+    cli-progress "^3.12.0"
+    debug "^4.3.4"
+    ejs "^3.1.8"
+    fs-extra "^9.1.0"
+    get-package-type "^0.1.0"
+    globby "^11.1.0"
+    hyperlinker "^1.0.0"
+    indent-string "^4.0.0"
+    is-wsl "^2.2.0"
+    js-yaml "^3.14.1"
+    natural-orderby "^2.0.3"
+    object-treeify "^1.1.33"
+    password-prompt "^1.1.2"
+    semver "^7.3.7"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    supports-color "^8.1.1"
+    supports-hyperlinks "^2.2.0"
+    ts-node "^10.9.1"
+    tslib "^2.5.0"
+    widest-line "^3.1.0"
+    wordwrap "^1.0.0"
+    wrap-ansi "^7.0.0"
+
 "@oclif/plugin-help@^5.1.19":
   version "5.2.6"
   resolved "https://registry.yarnpkg.com/@oclif/plugin-help/-/plugin-help-5.2.6.tgz#c3b8f8f7608d1969fa2730c4de5166ea9a4fc952"

From a5337bca679637aae4e2acc69b1a3da27bcd6ad5 Mon Sep 17 00:00:00 2001
From: svc-cli-bot <svc_cli_bot@salesforce.com>
Date: Wed, 29 Mar 2023 14:51:26 +0000
Subject: [PATCH 07/23] chore(release): 2.2.6-beta.2 [skip ci]

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 05d30f79..d57390ca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/sf-plugins-core",
-  "version": "2.2.6-beta.1",
+  "version": "2.2.6-beta.2",
   "description": "Utils for writing Salesforce CLI plugins",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -144,4 +144,4 @@
       "output": []
     }
   }
-}
+}
\ No newline at end of file

From 256ddc92c861c2220e94d10573911c7a72efc8b8 Mon Sep 17 00:00:00 2001
From: Peter Hale <peter.hale@salesforce.com>
Date: Wed, 29 Mar 2023 12:42:57 -0600
Subject: [PATCH 08/23] fix: bump core

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 05d30f79..0bfe02ef 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "/messages"
   ],
   "dependencies": {
-    "@oclif/core": "^2.8.1-beta.1",
+    "@oclif/core": "^2.8.1-beta.4",
     "@salesforce/core": "^3.34.6",
     "@salesforce/kit": "^1.9.2",
     "@salesforce/ts-types": "^1.7.3",
diff --git a/yarn.lock b/yarn.lock
index 163332ca..4f4ace24 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -710,10 +710,10 @@
     wordwrap "^1.0.0"
     wrap-ansi "^7.0.0"
 
-"@oclif/core@^2.8.1-beta.1":
-  version "2.8.1-beta.1"
-  resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.8.1-beta.1.tgz#fcb23978df884b568d9d00f0ea764d28303ef5d3"
-  integrity sha512-5FPjy27z0z75nIETTaezIGAcrDCJEn0Cjcu5Sg5jW4wtzM3buAuPpHjm+Yj6LSDtQVyw1If6aQx36Hh9MnnsBA==
+"@oclif/core@^2.8.1-beta.4":
+  version "2.8.1-beta.4"
+  resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.8.1-beta.4.tgz#962a6c20b925b49f80c3478e1f34408b534eba17"
+  integrity sha512-aLNElsI+4MXijvcdFHbJYL01/RlWArA4/GkHDK2zfXKyd8xY+NyiJeP+VajFiIkDPxUoo6XHQ7fvE/fpDxa1eQ==
   dependencies:
     "@types/cli-progress" "^3.11.0"
     ansi-escapes "^4.3.2"

From 2cba1edae808add10d69b7481805ab82314b3af5 Mon Sep 17 00:00:00 2001
From: svc-cli-bot <svc_cli_bot@salesforce.com>
Date: Wed, 29 Mar 2023 18:44:40 +0000
Subject: [PATCH 09/23] chore(release): 2.2.6-beta.3 [skip ci]

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 792d0c3b..bcb9c99c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/sf-plugins-core",
-  "version": "2.2.6-beta.2",
+  "version": "2.2.6-beta.3",
   "description": "Utils for writing Salesforce CLI plugins",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",

From 9d55ab65cec49c493b11fc6c595527dab3023ec1 Mon Sep 17 00:00:00 2001
From: Peter Hale <peter.hale@salesforce.com>
Date: Wed, 29 Mar 2023 13:07:02 -0600
Subject: [PATCH 10/23] fix: use context.options

---
 src/flags/orgFlags.ts | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/flags/orgFlags.ts b/src/flags/orgFlags.ts
index e4edd730..7e4bc9bd 100644
--- a/src/flags/orgFlags.ts
+++ b/src/flags/orgFlags.ts
@@ -106,8 +106,9 @@ export const optionalOrgFlag = Flags.custom({
     if (isWritingManifest) {
       return undefined;
     }
-    if (context.flags instanceof Org) {
-      return context.flags.getUsername();
+    if (context.options instanceof Org) {
+      const org = context.options as Org;
+      return org.getUsername();
     }
     return (await maybeGetOrg())?.getUsername();
   },
@@ -144,8 +145,9 @@ export const requiredOrgFlag = Flags.custom({
     if (isWritingManifest) {
       return undefined;
     }
-    if (context.flags instanceof Org) {
-      return context.flags.getUsername();
+    if (context.options instanceof Org) {
+      const org = context.options as Org;
+      return org.getUsername();
     }
     return (await maybeGetOrg())?.getUsername();
   },
@@ -183,8 +185,9 @@ export const requiredHubFlag = Flags.custom({
     if (isWritingManifest) {
       return undefined;
     }
-    if (context.flags instanceof Org) {
-      return context.flags.getUsername();
+    if (context.options instanceof Org) {
+      const org = context.options as Org;
+      return org.getUsername();
     }
     return (await maybeGetHub())?.getUsername();
   },
@@ -221,8 +224,9 @@ export const optionalHubFlag = Flags.custom({
     if (isWritingManifest) {
       return undefined;
     }
-    if (context.flags instanceof Org) {
-      return context.flags.getUsername();
+    if (context.options instanceof Org) {
+      const org = context.options as Org;
+      return org.getUsername();
     }
     return (await maybeGetHub())?.getUsername();
   },

From 2b446f06dc68f8af07e854c6a63116da7a9ff8f0 Mon Sep 17 00:00:00 2001
From: svc-cli-bot <svc_cli_bot@salesforce.com>
Date: Wed, 29 Mar 2023 19:07:39 +0000
Subject: [PATCH 11/23] chore(release): 2.2.6-beta.4 [skip ci]

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bcb9c99c..012db704 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/sf-plugins-core",
-  "version": "2.2.6-beta.3",
+  "version": "2.2.6-beta.4",
   "description": "Utils for writing Salesforce CLI plugins",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",

From 59e02a606ba68bf00697d10340dac40c8557f0b0 Mon Sep 17 00:00:00 2001
From: Peter Hale <peter.hale@salesforce.com>
Date: Wed, 29 Mar 2023 14:15:52 -0600
Subject: [PATCH 12/23] fix: onRelease flow needs dist tag

---
 .github/workflows/onRelease.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/onRelease.yml b/.github/workflows/onRelease.yml
index 70465bd1..954b6e80 100644
--- a/.github/workflows/onRelease.yml
+++ b/.github/workflows/onRelease.yml
@@ -24,6 +24,7 @@ jobs:
         id: distTag
   npm:
     uses: salesforcecli/github-workflows/.github/workflows/npmPublish.yml@main
+    needs: [getDistTag]
     with:
       tag: ${{ needs.getDistTag.outputs.tag || 'latest' }}
       githubTag: ${{ github.event.release.tag_name || inputs.tag }}

From 86bc96cdfc77de5fbb46724ae7f244551768dc2b Mon Sep 17 00:00:00 2001
From: svc-cli-bot <svc_cli_bot@salesforce.com>
Date: Wed, 29 Mar 2023 20:16:41 +0000
Subject: [PATCH 13/23] chore(release): 2.2.6-beta.5 [skip ci]

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 012db704..c03e3403 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/sf-plugins-core",
-  "version": "2.2.6-beta.4",
+  "version": "2.2.6-beta.5",
   "description": "Utils for writing Salesforce CLI plugins",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",

From 324079afe4c38d6d5c30af57c79c00338ac64266 Mon Sep 17 00:00:00 2001
From: svc-cli-bot <svc_cli_bot@salesforce.com>
Date: Wed, 19 Apr 2023 13:38:31 +0000
Subject: [PATCH 14/23] chore(release): 2.2.9 [skip ci]

---
 CHANGELOG.md | 673 +++++++++++++++++++++++++++++++++++++++++----------
 package.json |   4 +-
 2 files changed, 545 insertions(+), 132 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02d9b75f..0571d8b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,684 +1,1097 @@
+## [2.2.9](https://github.com/salesforcecli/sf-plugins-core/compare/2.2.8...2.2.9) (2023-04-19)
+
+
+
+## [2.2.6-beta.5](https://github.com/salesforcecli/sf-plugins-core/compare/2.2.6-beta.4...2.2.6-beta.5) (2023-03-29)
+
+
+### Bug Fixes
+
+* onRelease flow needs dist tag ([59e02a6](https://github.com/salesforcecli/sf-plugins-core/commit/59e02a606ba68bf00697d10340dac40c8557f0b0))
+
+
+
+## [2.2.6-beta.4](https://github.com/salesforcecli/sf-plugins-core/compare/2.2.6-beta.3...2.2.6-beta.4) (2023-03-29)
+
+
+### Bug Fixes
+
+* use context.options ([9d55ab6](https://github.com/salesforcecli/sf-plugins-core/commit/9d55ab65cec49c493b11fc6c595527dab3023ec1))
+
+
+
+## [2.2.6-beta.3](https://github.com/salesforcecli/sf-plugins-core/compare/2.2.6-beta.2...2.2.6-beta.3) (2023-03-29)
+
+
+### Bug Fixes
+
+* bump core ([256ddc9](https://github.com/salesforcecli/sf-plugins-core/commit/256ddc92c861c2220e94d10573911c7a72efc8b8))
+
+
+
+## [2.2.6-beta.2](https://github.com/salesforcecli/sf-plugins-core/compare/2.2.5...2.2.6-beta.2) (2023-03-29)
+
+
+### Bug Fixes
+
+* use ability to omit default and defaultHelp from manifest ([ad6be7c](https://github.com/salesforcecli/sf-plugins-core/commit/ad6be7cff5d5d8b3317ee7e104502ac44c106f18))
+
+
+
 ## [2.2.8](https://github.com/salesforcecli/sf-plugins-core/compare/2.2.7...2.2.8) (2023-04-16)
 
+
 ### Bug Fixes
 
-- **deps:** bump @oclif/core from 2.8.0 to 2.8.2 ([fa99f51](https://github.com/salesforcecli/sf-plugins-core/commit/fa99f514b7de1f0ecf5896dc93cbe96cdf4a36db))
+* **deps:** bump @oclif/core from 2.8.0 to 2.8.2 ([fa99f51](https://github.com/salesforcecli/sf-plugins-core/commit/fa99f514b7de1f0ecf5896dc93cbe96cdf4a36db))
+
+
 
 ## [2.2.7](https://github.com/salesforcecli/sf-plugins-core/compare/2.2.6...2.2.7) (2023-04-02)
 
+
 ### Bug Fixes
 
-- **deps:** bump @salesforce/core from 3.34.1 to 3.34.6 ([efbc49d](https://github.com/salesforcecli/sf-plugins-core/commit/efbc49d4c46be8f9486299342f8796bb902676c5))
+* **deps:** bump @salesforce/core from 3.34.1 to 3.34.6 ([efbc49d](https://github.com/salesforcecli/sf-plugins-core/commit/efbc49d4c46be8f9486299342f8796bb902676c5))
+
+
+
+## [2.2.6](https://github.com/salesforcecli/sf-plugins-core/compare/2.2.6-beta.5...2.2.6) (2023-04-02)
 
-## [2.2.6](https://github.com/salesforcecli/sf-plugins-core/compare/2.2.5...2.2.6) (2023-04-02)
 
 ### Bug Fixes
 
-- **deps:** bump @oclif/core from 2.7.1 to 2.8.0 ([580c9c7](https://github.com/salesforcecli/sf-plugins-core/commit/580c9c74f6cfd99004f2f6df0ed497cdaeadbb6c))
+* **deps:** bump @oclif/core from 2.7.1 to 2.8.0 ([580c9c7](https://github.com/salesforcecli/sf-plugins-core/commit/580c9c74f6cfd99004f2f6df0ed497cdaeadbb6c))
+
+
+
+## [2.2.6-beta.5](https://github.com/salesforcecli/sf-plugins-core/compare/2.2.6-beta.4...2.2.6-beta.5) (2023-03-29)
+
+
+### Bug Fixes
+
+* onRelease flow needs dist tag ([59e02a6](https://github.com/salesforcecli/sf-plugins-core/commit/59e02a606ba68bf00697d10340dac40c8557f0b0))
+
+
+
+## [2.2.6-beta.4](https://github.com/salesforcecli/sf-plugins-core/compare/2.2.6-beta.3...2.2.6-beta.4) (2023-03-29)
+
+
+### Bug Fixes
+
+* use context.options ([9d55ab6](https://github.com/salesforcecli/sf-plugins-core/commit/9d55ab65cec49c493b11fc6c595527dab3023ec1))
+
+
+
+## [2.2.6-beta.3](https://github.com/salesforcecli/sf-plugins-core/compare/2.2.6-beta.2...2.2.6-beta.3) (2023-03-29)
+
+
+### Bug Fixes
+
+* bump core ([256ddc9](https://github.com/salesforcecli/sf-plugins-core/commit/256ddc92c861c2220e94d10573911c7a72efc8b8))
+
+
+
+## [2.2.6-beta.2](https://github.com/salesforcecli/sf-plugins-core/compare/2.2.5...2.2.6-beta.2) (2023-03-29)
+
+
+### Bug Fixes
+
+* use ability to omit default and defaultHelp from manifest ([ad6be7c](https://github.com/salesforcecli/sf-plugins-core/commit/ad6be7cff5d5d8b3317ee7e104502ac44c106f18))
+
+
 
 ## [2.2.5](https://github.com/salesforcecli/sf-plugins-core/compare/2.2.4...2.2.5) (2023-03-19)
 
+
 ### Bug Fixes
 
-- **deps:** bump @salesforce/core from 3.33.5 to 3.34.1 ([b17fbe2](https://github.com/salesforcecli/sf-plugins-core/commit/b17fbe2c6dbe4143a80c05dda7768f703882c628))
+* **deps:** bump @salesforce/core from 3.33.5 to 3.34.1 ([b17fbe2](https://github.com/salesforcecli/sf-plugins-core/commit/b17fbe2c6dbe4143a80c05dda7768f703882c628))
+
+
 
 ## [2.2.4](https://github.com/salesforcecli/sf-plugins-core/compare/2.2.3...2.2.4) (2023-03-01)
 
+
 ### Bug Fixes
 
-- add skipOclifErrorHandling to errors thrown from SfCommand.catch ([#234](https://github.com/salesforcecli/sf-plugins-core/issues/234)) ([82660ef](https://github.com/salesforcecli/sf-plugins-core/commit/82660efe0bbeea085ec4549c7a2407eee87154d5))
+* add skipOclifErrorHandling to errors thrown from SfCommand.catch ([#234](https://github.com/salesforcecli/sf-plugins-core/issues/234)) ([82660ef](https://github.com/salesforcecli/sf-plugins-core/commit/82660efe0bbeea085ec4549c7a2407eee87154d5))
+
+
 
 ## [2.2.3](https://github.com/salesforcecli/sf-plugins-core/compare/2.2.2...2.2.3) (2023-02-24)
 
+
 ### Bug Fixes
 
-- add logJson stub ([5f84c48](https://github.com/salesforcecli/sf-plugins-core/commit/5f84c489f3365df71a6bc89fe7cdfa3129b38dc4))
+* add logJson stub ([5f84c48](https://github.com/salesforcecli/sf-plugins-core/commit/5f84c489f3365df71a6bc89fe7cdfa3129b38dc4))
+
+
 
 ## [2.2.2](https://github.com/salesforcecli/sf-plugins-core/compare/2.2.1...2.2.2) (2023-02-23)
 
+
 ### Bug Fixes
 
-- throw SfError from catch ([#230](https://github.com/salesforcecli/sf-plugins-core/issues/230)) ([1eb1c17](https://github.com/salesforcecli/sf-plugins-core/commit/1eb1c1715ceef59ee424677a351607ae0568b513))
+* throw SfError from catch ([#230](https://github.com/salesforcecli/sf-plugins-core/issues/230)) ([1eb1c17](https://github.com/salesforcecli/sf-plugins-core/commit/1eb1c1715ceef59ee424677a351607ae0568b513))
+
+
 
 ## [2.2.1](https://github.com/salesforcecli/sf-plugins-core/compare/2.2.0...2.2.1) (2023-02-21)
 
+
 ### Bug Fixes
 
-- throw from catch ([#229](https://github.com/salesforcecli/sf-plugins-core/issues/229)) ([6dcb16f](https://github.com/salesforcecli/sf-plugins-core/commit/6dcb16f5cc662a07fb2217ffc5401c7ff7a14d61))
+* throw from catch ([#229](https://github.com/salesforcecli/sf-plugins-core/issues/229)) ([6dcb16f](https://github.com/salesforcecli/sf-plugins-core/commit/6dcb16f5cc662a07fb2217ffc5401c7ff7a14d61))
+
+
 
 # [2.2.0](https://github.com/salesforcecli/sf-plugins-core/compare/2.1.3...2.2.0) (2023-02-20)
 
+
 ### Features
 
-- export Spinner and remove console.error ([#223](https://github.com/salesforcecli/sf-plugins-core/issues/223)) ([04475a0](https://github.com/salesforcecli/sf-plugins-core/commit/04475a0792bd8393be1885c22ccdefcf90740193))
+* export Spinner and remove console.error ([#223](https://github.com/salesforcecli/sf-plugins-core/issues/223)) ([04475a0](https://github.com/salesforcecli/sf-plugins-core/commit/04475a0792bd8393be1885c22ccdefcf90740193))
+
+
 
 ## [2.1.3](https://github.com/salesforcecli/sf-plugins-core/compare/2.1.2...2.1.3) (2023-02-20)
 
+
 ### Bug Fixes
 
-- \_run type ([#227](https://github.com/salesforcecli/sf-plugins-core/issues/227)) ([5b01252](https://github.com/salesforcecli/sf-plugins-core/commit/5b012527c020829f891f029fe77779e75a6e665f))
+* _run type ([#227](https://github.com/salesforcecli/sf-plugins-core/issues/227)) ([5b01252](https://github.com/salesforcecli/sf-plugins-core/commit/5b012527c020829f891f029fe77779e75a6e665f))
+
+
 
 ## [2.1.2](https://github.com/salesforcecli/sf-plugins-core/compare/2.1.1...2.1.2) (2023-02-13)
 
+
 ### Bug Fixes
 
-- dont allow hooks to exit process ([#217](https://github.com/salesforcecli/sf-plugins-core/issues/217)) ([928f89d](https://github.com/salesforcecli/sf-plugins-core/commit/928f89dce4ba85a2dd8b59d78a6823e7b22cf83d))
+* dont allow hooks to exit process ([#217](https://github.com/salesforcecli/sf-plugins-core/issues/217)) ([928f89d](https://github.com/salesforcecli/sf-plugins-core/commit/928f89dce4ba85a2dd8b59d78a6823e7b22cf83d))
+
+
 
 ## [2.1.1](https://github.com/salesforcecli/sf-plugins-core/compare/2.1.0...2.1.1) (2023-02-10)
 
+
 ### Bug Fixes
 
-- warnings to stderr ([fb0c56a](https://github.com/salesforcecli/sf-plugins-core/commit/fb0c56a51474a9cca7e923e34a0fd0e7ffc3d683))
+* warnings to stderr ([fb0c56a](https://github.com/salesforcecli/sf-plugins-core/commit/fb0c56a51474a9cca7e923e34a0fd0e7ffc3d683))
+
+
 
 # [2.1.0](https://github.com/salesforcecli/sf-plugins-core/compare/2.0.2...2.1.0) (2023-02-09)
 
+
 ### Features
 
-- add default answer param to confirm ([#215](https://github.com/salesforcecli/sf-plugins-core/issues/215)) ([dc40d45](https://github.com/salesforcecli/sf-plugins-core/commit/dc40d45a51e0d153981123e2a435896a7855bc93))
+* add default answer param to confirm ([#215](https://github.com/salesforcecli/sf-plugins-core/issues/215)) ([dc40d45](https://github.com/salesforcecli/sf-plugins-core/commit/dc40d45a51e0d153981123e2a435896a7855bc93))
+
+
 
 ## [2.0.2](https://github.com/salesforcecli/sf-plugins-core/compare/2.0.1...2.0.2) (2023-02-07)
 
+
 ### Bug Fixes
 
-- **deps:** bump oclif core for multi-flag fix ([#213](https://github.com/salesforcecli/sf-plugins-core/issues/213)) ([6b3156a](https://github.com/salesforcecli/sf-plugins-core/commit/6b3156a9683e1a8c6eb05d87154c3850f993e483))
+* **deps:** bump oclif core for multi-flag fix ([#213](https://github.com/salesforcecli/sf-plugins-core/issues/213)) ([6b3156a](https://github.com/salesforcecli/sf-plugins-core/commit/6b3156a9683e1a8c6eb05d87154c3850f993e483))
+
+
 
 ## [2.0.1](https://github.com/salesforcecli/sf-plugins-core/compare/1.22.3...2.0.1) (2023-01-30)
 
+
+
 ## [1.22.3](https://github.com/salesforcecli/sf-plugins-core/compare/1.22.2...1.22.3) (2023-01-29)
 
+
 ### Bug Fixes
 
-- **deps:** bump @salesforce/core from 3.32.12 to 3.33.1 ([b3a0792](https://github.com/salesforcecli/sf-plugins-core/commit/b3a0792c6cddb5dd7eca2f0435861be3107d2aed))
+* **deps:** bump @salesforce/core from 3.32.12 to 3.33.1 ([b3a0792](https://github.com/salesforcecli/sf-plugins-core/commit/b3a0792c6cddb5dd7eca2f0435861be3107d2aed))
+
+
 
 ## [1.22.2](https://github.com/salesforcecli/sf-plugins-core/compare/1.22.1...1.22.2) (2023-01-22)
 
+
 ### Bug Fixes
 
-- **deps:** bump @salesforce/kit from 1.8.0 to 1.8.3 ([0d671c5](https://github.com/salesforcecli/sf-plugins-core/commit/0d671c5582934984b8fd05d1a715d283f6859652))
+* **deps:** bump @salesforce/kit from 1.8.0 to 1.8.3 ([0d671c5](https://github.com/salesforcecli/sf-plugins-core/commit/0d671c5582934984b8fd05d1a715d283f6859652))
+
+
 
 ## [1.22.1](https://github.com/salesforcecli/sf-plugins-core/compare/1.22.0...1.22.1) (2023-01-13)
 
+
 ### Bug Fixes
 
-- no default hub with default org ([c59d264](https://github.com/salesforcecli/sf-plugins-core/commit/c59d26414f5fdd16433431935f69688e8b42479a))
+* no default hub with default org ([c59d264](https://github.com/salesforcecli/sf-plugins-core/commit/c59d26414f5fdd16433431935f69688e8b42479a))
+
+
 
 # [1.22.0](https://github.com/salesforcecli/sf-plugins-core/compare/1.21.8...1.22.0) (2023-01-10)
 
+
 ### Features
 
-- optional devhub flag (and deprecated equivalent) ([8458fc3](https://github.com/salesforcecli/sf-plugins-core/commit/8458fc3ea1a2ed055d6e9c59e4d9e43da0efbf91))
+* optional devhub flag (and deprecated equivalent) ([8458fc3](https://github.com/salesforcecli/sf-plugins-core/commit/8458fc3ea1a2ed055d6e9c59e4d9e43da0efbf91))
+
+
 
 ## [1.21.8](https://github.com/salesforcecli/sf-plugins-core/compare/1.21.7...1.21.8) (2023-01-10)
 
+
 ### Bug Fixes
 
-- allowed optional properties on Deployers ([941abda](https://github.com/salesforcecli/sf-plugins-core/commit/941abdaa7b8391ad78ce537d6ae5c561adff2938))
-- revert pr [#33](https://github.com/salesforcecli/sf-plugins-core/issues/33) (caused downstream type problems) ([1cc7e07](https://github.com/salesforcecli/sf-plugins-core/commit/1cc7e0738de190805cccd5404674df2b6ab5a7de))
+* allowed optional properties on Deployers ([941abda](https://github.com/salesforcecli/sf-plugins-core/commit/941abdaa7b8391ad78ce537d6ae5c561adff2938))
+* revert pr [#33](https://github.com/salesforcecli/sf-plugins-core/issues/33) (caused downstream type problems) ([1cc7e07](https://github.com/salesforcecli/sf-plugins-core/commit/1cc7e0738de190805cccd5404674df2b6ab5a7de))
+
+
 
 ## [1.21.7](https://github.com/salesforcecli/sf-plugins-core/compare/1.21.6...1.21.7) (2023-01-09)
 
+
 ### Bug Fixes
 
-- add ‘both’ type to id flag ([e58a70f](https://github.com/salesforcecli/sf-plugins-core/commit/e58a70fb7e692f9b91ce39915f6483afda613748))
+* add ‘both’ type to id flag ([e58a70f](https://github.com/salesforcecli/sf-plugins-core/commit/e58a70fb7e692f9b91ce39915f6483afda613748))
+
+
 
 ## [1.21.6](https://github.com/salesforcecli/sf-plugins-core/compare/1.21.5...1.21.6) (2023-01-07)
 
+
 ### Bug Fixes
 
-- **deps:** bump json5 from 1.0.1 to 1.0.2 ([3e72202](https://github.com/salesforcecli/sf-plugins-core/commit/3e72202da74572423b3bae2200009fc7ede163e5))
+* **deps:** bump json5 from 1.0.1 to 1.0.2 ([3e72202](https://github.com/salesforcecli/sf-plugins-core/commit/3e72202da74572423b3bae2200009fc7ede163e5))
+
+
 
 ## [1.21.5](https://github.com/salesforcecli/sf-plugins-core/compare/1.21.4...1.21.5) (2023-01-01)
 
+
 ### Bug Fixes
 
-- **deps:** bump @salesforce/core from 3.32.9 to 3.32.12 ([13c9722](https://github.com/salesforcecli/sf-plugins-core/commit/13c9722f1fc01d63bd27d6465831b36753e5ba72))
+* **deps:** bump @salesforce/core from 3.32.9 to 3.32.12 ([13c9722](https://github.com/salesforcecli/sf-plugins-core/commit/13c9722f1fc01d63bd27d6465831b36753e5ba72))
+
+
 
 ## [1.21.4](https://github.com/salesforcecli/sf-plugins-core/compare/1.21.3...1.21.4) (2023-01-01)
 
+
 ### Bug Fixes
 
-- **deps:** bump @oclif/core from 1.22.0 to 1.23.1 ([d6a0869](https://github.com/salesforcecli/sf-plugins-core/commit/d6a086994575165848f7c1500876fa6fdb7d9e56))
+* **deps:** bump @oclif/core from 1.22.0 to 1.23.1 ([d6a0869](https://github.com/salesforcecli/sf-plugins-core/commit/d6a086994575165848f7c1500876fa6fdb7d9e56))
+
+
 
 ## [1.21.3](https://github.com/salesforcecli/sf-plugins-core/compare/1.21.2...1.21.3) (2022-12-19)
 
+
 ### Bug Fixes
 
-- get good typing for array flags ([1e6ae3f](https://github.com/salesforcecli/sf-plugins-core/commit/1e6ae3f63be9452e2035f88ae715d1e2457ee9dc))
-- required flags use `required` for oclif types ([40147b7](https://github.com/salesforcecli/sf-plugins-core/commit/40147b7f92b8f371ae357f8d8213a0cf9eb4c3c0))
-- required prop on compatibility ([87401b9](https://github.com/salesforcecli/sf-plugins-core/commit/87401b90dcaf72bfa1a8d276d164fa0b5a94cbd0))
+* get good typing for array flags ([1e6ae3f](https://github.com/salesforcecli/sf-plugins-core/commit/1e6ae3f63be9452e2035f88ae715d1e2457ee9dc))
+* required flags use `required` for oclif types ([40147b7](https://github.com/salesforcecli/sf-plugins-core/commit/40147b7f92b8f371ae357f8d8213a0cf9eb4c3c0))
+* required prop on compatibility ([87401b9](https://github.com/salesforcecli/sf-plugins-core/commit/87401b90dcaf72bfa1a8d276d164fa0b5a94cbd0))
+
+
 
 ## [1.21.2](https://github.com/salesforcecli/sf-plugins-core/compare/1.21.1...1.21.2) (2022-12-18)
 
+
 ### Bug Fixes
 
-- **deps:** bump @oclif/core from 1.21.0 to 1.22.0 ([4416a6e](https://github.com/salesforcecli/sf-plugins-core/commit/4416a6e60ebeb868cc30d33d99a0a5c5dbf23246))
+* **deps:** bump @oclif/core from 1.21.0 to 1.22.0 ([4416a6e](https://github.com/salesforcecli/sf-plugins-core/commit/4416a6e60ebeb868cc30d33d99a0a5c5dbf23246))
+
+
 
 ## [1.21.1](https://github.com/salesforcecli/sf-plugins-core/compare/1.21.0...1.21.1) (2022-12-14)
 
+
 ### Bug Fixes
 
-- **deps:** bump @salesforce/core from 3.32.6 to 3.32.9 ([8ba261d](https://github.com/salesforcecli/sf-plugins-core/commit/8ba261de6079facf0321743852910a2e6f9903f3))
+* **deps:** bump @salesforce/core from 3.32.6 to 3.32.9 ([8ba261d](https://github.com/salesforcecli/sf-plugins-core/commit/8ba261de6079facf0321743852910a2e6f9903f3))
+
+
 
 # [1.21.0](https://github.com/salesforcecli/sf-plugins-core/compare/1.20.0...1.21.0) (2022-12-07)
 
+
 ### Features
 
-- add array style flag for backward compatibility ([#155](https://github.com/salesforcecli/sf-plugins-core/issues/155)) ([b1844a4](https://github.com/salesforcecli/sf-plugins-core/commit/b1844a495d2adb289b90c0e46f86553a335345e0))
+* add array style flag for backward compatibility ([#155](https://github.com/salesforcecli/sf-plugins-core/issues/155)) ([b1844a4](https://github.com/salesforcecli/sf-plugins-core/commit/b1844a495d2adb289b90c0e46f86553a335345e0))
+
+
 
 # [1.20.0](https://github.com/salesforcecli/sf-plugins-core/compare/1.19.3...1.20.0) (2022-12-07)
 
+
 ### Features
 
-- prompter.confirm can require a positive answer([#157](https://github.com/salesforcecli/sf-plugins-core/issues/157)) ([05571a0](https://github.com/salesforcecli/sf-plugins-core/commit/05571a0f9c5111b8bbbcfcd0cdcf3854a5afa1b3))
+* prompter.confirm can require a positive answer([#157](https://github.com/salesforcecli/sf-plugins-core/issues/157)) ([05571a0](https://github.com/salesforcecli/sf-plugins-core/commit/05571a0f9c5111b8bbbcfcd0cdcf3854a5afa1b3))
+
+
 
 ## [1.19.3](https://github.com/salesforcecli/sf-plugins-core/compare/1.19.2...1.19.3) (2022-12-07)
 
+
 ### Bug Fixes
 
-- update loglevel warn msg to mention env var ([#156](https://github.com/salesforcecli/sf-plugins-core/issues/156)) ([758c813](https://github.com/salesforcecli/sf-plugins-core/commit/758c813a0870c2289bda841cb1ad898ae11ada7f))
+* update loglevel warn msg to mention env var ([#156](https://github.com/salesforcecli/sf-plugins-core/issues/156)) ([758c813](https://github.com/salesforcecli/sf-plugins-core/commit/758c813a0870c2289bda841cb1ad898ae11ada7f))
+
+
 
 ## [1.19.2](https://github.com/salesforcecli/sf-plugins-core/compare/1.19.1...1.19.2) (2022-12-06)
 
+
+
 ## [1.19.1](https://github.com/salesforcecli/sf-plugins-core/compare/1.19.0...1.19.1) (2022-12-04)
 
+
 ### Bug Fixes
 
-- **deps:** bump @salesforce/core from 3.32.1 to 3.32.6 ([2c9846c](https://github.com/salesforcecli/sf-plugins-core/commit/2c9846c55ed9dca275652dde3fef9c98df9aa499))
+* **deps:** bump @salesforce/core from 3.32.1 to 3.32.6 ([2c9846c](https://github.com/salesforcecli/sf-plugins-core/commit/2c9846c55ed9dca275652dde3fef9c98df9aa499))
+
+
 
 # [1.19.0](https://github.com/salesforcecli/sf-plugins-core/compare/1.18.1...1.19.0) (2022-11-22)
 
+
 ### Features
 
-- subscribe existing hooks to matching events ([4e85ebe](https://github.com/salesforcecli/sf-plugins-core/commit/4e85ebe6d728760fbabf26a4c921a320e5a16f38))
+* subscribe existing hooks to matching events ([4e85ebe](https://github.com/salesforcecli/sf-plugins-core/commit/4e85ebe6d728760fbabf26a4c921a320e5a16f38))
+
+
 
 ## [1.18.1](https://github.com/salesforcecli/sf-plugins-core/compare/1.18.0...1.18.1) (2022-11-18)
 
+
 ### Bug Fixes
 
-- add `summary` field to org flags ([#137](https://github.com/salesforcecli/sf-plugins-core/issues/137)) ([936dea0](https://github.com/salesforcecli/sf-plugins-core/commit/936dea0ce583c19eec12ec738896884974050c86))
+* add `summary` field to org flags ([#137](https://github.com/salesforcecli/sf-plugins-core/issues/137)) ([936dea0](https://github.com/salesforcecli/sf-plugins-core/commit/936dea0ce583c19eec12ec738896884974050c86))
+
+
 
 # [1.18.0](https://github.com/salesforcecli/sf-plugins-core/compare/1.17.7...1.18.0) (2022-11-17)
 
+
 ### Bug Fixes
 
-- use -o for target-org ([1706d9c](https://github.com/salesforcecli/sf-plugins-core/commit/1706d9c108d5d96ea13147202547dab12701a12b))
-- use o for target-org, not e ([e082eeb](https://github.com/salesforcecli/sf-plugins-core/commit/e082eeb0a24ac016b1be928b9c63cf2802d189d2))
+* use -o for target-org ([1706d9c](https://github.com/salesforcecli/sf-plugins-core/commit/1706d9c108d5d96ea13147202547dab12701a12b))
+* use o for target-org, not e ([e082eeb](https://github.com/salesforcecli/sf-plugins-core/commit/e082eeb0a24ac016b1be928b9c63cf2802d189d2))
+
 
 ### Features
 
-- deprecated org flags ([449b1cf](https://github.com/salesforcecli/sf-plugins-core/commit/449b1cfa28da0126948ff5f7e5ffa14f05338a3b))
-- use sfdx's apiversion and loglevel flags ([77f5bd5](https://github.com/salesforcecli/sf-plugins-core/commit/77f5bd56cd5d78e158f256912591f31218b402c1))
+* deprecated org flags ([449b1cf](https://github.com/salesforcecli/sf-plugins-core/commit/449b1cfa28da0126948ff5f7e5ffa14f05338a3b))
+* use sfdx's apiversion and loglevel flags ([77f5bd5](https://github.com/salesforcecli/sf-plugins-core/commit/77f5bd56cd5d78e158f256912591f31218b402c1))
+
+
 
 ## [1.17.7](https://github.com/salesforcecli/sf-plugins-core/compare/1.17.6...1.17.7) (2022-11-17)
 
+
 ### Bug Fixes
 
-- **deps:** bump @salesforce/core from 3.31.16 to 3.31.19 ([124a8a4](https://github.com/salesforcecli/sf-plugins-core/commit/124a8a484398c28c152ba786a8b30f0c21acf14c))
+* **deps:** bump @salesforce/core from 3.31.16 to 3.31.19 ([124a8a4](https://github.com/salesforcecli/sf-plugins-core/commit/124a8a484398c28c152ba786a8b30f0c21acf14c))
+
+
 
 ## [1.17.6](https://github.com/salesforcecli/sf-plugins-core/compare/1.17.5...1.17.6) (2022-11-13)
 
+
 ### Bug Fixes
 
-- **deps:** bump @salesforce/ts-types from 1.7.0 to 1.7.1 ([517db39](https://github.com/salesforcecli/sf-plugins-core/commit/517db39723a28bee5001aa2fc4152d52fab42a06))
+* **deps:** bump @salesforce/ts-types from 1.7.0 to 1.7.1 ([517db39](https://github.com/salesforcecli/sf-plugins-core/commit/517db39723a28bee5001aa2fc4152d52fab42a06))
+
+
 
 ## [1.17.5](https://github.com/salesforcecli/sf-plugins-core/compare/1.17.4...1.17.5) (2022-11-13)
 
+
 ### Bug Fixes
 
-- **deps:** bump @oclif/core from 1.20.0 to 1.20.4 ([4fe73b4](https://github.com/salesforcecli/sf-plugins-core/commit/4fe73b466db85c4caa54348900860d6c287bcf45))
+* **deps:** bump @oclif/core from 1.20.0 to 1.20.4 ([4fe73b4](https://github.com/salesforcecli/sf-plugins-core/commit/4fe73b466db85c4caa54348900860d6c287bcf45))
+
+
 
 ## [1.17.4](https://github.com/salesforcecli/sf-plugins-core/compare/1.17.3...1.17.4) (2022-11-02)
 
+
 ### Bug Fixes
 
-- **deps:** bump @oclif/core from 1.19.1 to 1.20.0 ([73bb83e](https://github.com/salesforcecli/sf-plugins-core/commit/73bb83e1054d4929fd3b6f7e68df942ab52ad1f1))
+* **deps:** bump @oclif/core from 1.19.1 to 1.20.0 ([73bb83e](https://github.com/salesforcecli/sf-plugins-core/commit/73bb83e1054d4929fd3b6f7e68df942ab52ad1f1))
+
+
 
 ## [1.17.3](https://github.com/salesforcecli/sf-plugins-core/compare/1.17.2...1.17.3) (2022-10-30)
 
+
 ### Bug Fixes
 
-- **deps:** bump inquirer from 8.2.4 to 8.2.5 ([446b1e4](https://github.com/salesforcecli/sf-plugins-core/commit/446b1e40cffa91b2b8dfa457d10616aa065ca4af))
+* **deps:** bump inquirer from 8.2.4 to 8.2.5 ([446b1e4](https://github.com/salesforcecli/sf-plugins-core/commit/446b1e40cffa91b2b8dfa457d10616aa065ca4af))
+
+
 
 ## [1.17.2](https://github.com/salesforcecli/sf-plugins-core/compare/1.17.1...1.17.2) (2022-10-30)
 
+
 ### Bug Fixes
 
-- **deps:** bump @salesforce/kit from 1.7.0 to 1.7.1 ([b25e3e8](https://github.com/salesforcecli/sf-plugins-core/commit/b25e3e8f07c515f1b07025f60b5367eee6b5208a))
+* **deps:** bump @salesforce/kit from 1.7.0 to 1.7.1 ([b25e3e8](https://github.com/salesforcecli/sf-plugins-core/commit/b25e3e8f07c515f1b07025f60b5367eee6b5208a))
+
+
 
 ## [1.17.1](https://github.com/salesforcecli/sf-plugins-core/compare/1.17.0...1.17.1) (2022-10-26)
 
+
 ### Bug Fixes
 
-- **deps:** bump @oclif/core from 1.19.0 to 1.19.1 ([efb5d51](https://github.com/salesforcecli/sf-plugins-core/commit/efb5d5156a266306beba5efdb689865805c8b53b))
+* **deps:** bump @oclif/core from 1.19.0 to 1.19.1 ([efb5d51](https://github.com/salesforcecli/sf-plugins-core/commit/efb5d5156a266306beba5efdb689865805c8b53b))
+
+
 
 # [1.17.0](https://github.com/salesforcecli/sf-plugins-core/compare/1.16.1...1.17.0) (2022-10-20)
 
+
 ### Features
 
-- improve Ux options ([#113](https://github.com/salesforcecli/sf-plugins-core/issues/113)) ([fc91673](https://github.com/salesforcecli/sf-plugins-core/commit/fc91673f6e0bff71e4a05e2a53ab7eb434e20c58))
+* improve Ux options ([#113](https://github.com/salesforcecli/sf-plugins-core/issues/113)) ([fc91673](https://github.com/salesforcecli/sf-plugins-core/commit/fc91673f6e0bff71e4a05e2a53ab7eb434e20c58))
+
+
 
 ## [1.16.1](https://github.com/salesforcecli/sf-plugins-core/compare/1.16.0...1.16.1) (2022-10-20)
 
+
 ### Bug Fixes
 
-- **deps:** bump @salesforce/core from 3.30.9 to 3.31.16 ([4dc2d53](https://github.com/salesforcecli/sf-plugins-core/commit/4dc2d5303e63e775a4237823759f5929e47eb00d))
+* **deps:** bump @salesforce/core from 3.30.9 to 3.31.16 ([4dc2d53](https://github.com/salesforcecli/sf-plugins-core/commit/4dc2d5303e63e775a4237823759f5929e47eb00d))
+
+
 
 # [1.16.0](https://github.com/salesforcecli/sf-plugins-core/compare/1.15.2...1.16.0) (2022-10-20)
 
+
 ### Features
 
-- export Ux and add configAggregator to SfCommand ([#106](https://github.com/salesforcecli/sf-plugins-core/issues/106)) ([9c03d8d](https://github.com/salesforcecli/sf-plugins-core/commit/9c03d8d569deab77e2e80d47e62b6b76e09f4d20))
+* export Ux and add configAggregator to SfCommand ([#106](https://github.com/salesforcecli/sf-plugins-core/issues/106)) ([9c03d8d](https://github.com/salesforcecli/sf-plugins-core/commit/9c03d8d569deab77e2e80d47e62b6b76e09f4d20))
+
+
 
 ## [1.15.2](https://github.com/salesforcecli/sf-plugins-core/compare/1.15.1...1.15.2) (2022-10-15)
 
+
 ### Bug Fixes
 
-- **deps:** bump @salesforce/kit from 1.5.44 to 1.7.0 ([3561000](https://github.com/salesforcecli/sf-plugins-core/commit/3561000058a131b147baaeeaaae337078fb96020))
+* **deps:** bump @salesforce/kit from 1.5.44 to 1.7.0 ([3561000](https://github.com/salesforcecli/sf-plugins-core/commit/3561000058a131b147baaeeaaae337078fb96020))
+
+
 
 ## [1.15.1](https://github.com/salesforcecli/sf-plugins-core/compare/1.15.0...1.15.1) (2022-10-13)
 
+
 ### Bug Fixes
 
-- parse varargs response type ([35b1aa9](https://github.com/salesforcecli/sf-plugins-core/commit/35b1aa9a7a17b246f8508a2b89e9eaa143824581))
+* parse varargs response type ([35b1aa9](https://github.com/salesforcecli/sf-plugins-core/commit/35b1aa9a7a17b246f8508a2b89e9eaa143824581))
+
+
 
 # [1.15.0](https://github.com/salesforcecli/sf-plugins-core/compare/v1.14.1...1.15.0) (2022-10-11)
 
+
 ### Features
 
-- support varargs ([6a24106](https://github.com/salesforcecli/sf-plugins-core/commit/6a241069791fe98f861e6011b47696dd86b746e7))
+* support varargs ([6a24106](https://github.com/salesforcecli/sf-plugins-core/commit/6a241069791fe98f861e6011b47696dd86b746e7))
+
+
 
 ## [1.14.1](https://github.com/salesforcecli/sf-plugins-core/compare/v1.13.2...v1.14.1) (2022-08-23)
 
+
 ### Features
 
-- update custom flag definitions ([828daac](https://github.com/salesforcecli/sf-plugins-core/commit/828daac881124e7f1ef75a2efbcbd0de4a71bb3c))
+* update custom flag definitions ([828daac](https://github.com/salesforcecli/sf-plugins-core/commit/828daac881124e7f1ef75a2efbcbd0de4a71bb3c))
+
+
 
 ## [1.13.2](https://github.com/salesforcecli/sf-plugins-core/compare/v1.13.1...v1.13.2) (2022-08-09)
 
+
 ### Bug Fixes
 
-- add function overloads to custom flags ([12c1178](https://github.com/salesforcecli/sf-plugins-core/commit/12c117837a08bc8cf8eff41832f95a19d3386b18))
-- compile errors ([3782a70](https://github.com/salesforcecli/sf-plugins-core/commit/3782a703b7b0eddbc3d47a7dcbdf33272bdfd6fc))
+* add function overloads to custom flags ([12c1178](https://github.com/salesforcecli/sf-plugins-core/commit/12c117837a08bc8cf8eff41832f95a19d3386b18))
+* compile errors ([3782a70](https://github.com/salesforcecli/sf-plugins-core/commit/3782a703b7b0eddbc3d47a7dcbdf33272bdfd6fc))
+
+
 
 ## [1.13.1](https://github.com/salesforcecli/sf-plugins-core/compare/v1.13.0...v1.13.1) (2022-08-03)
 
+
 ### Bug Fixes
 
-- add number to deploy function return type ([ac9457b](https://github.com/salesforcecli/sf-plugins-core/commit/ac9457b78ab1242090fc4322ec266e8d0157cb6f))
+* add number to deploy function return type ([ac9457b](https://github.com/salesforcecli/sf-plugins-core/commit/ac9457b78ab1242090fc4322ec266e8d0157cb6f))
+
+
 
 # [1.13.0](https://github.com/salesforcecli/sf-plugins-core/compare/v1.12.3...v1.13.0) (2022-06-09)
 
+
 ### Bug Fixes
 
-- error can't be spread ([30930b7](https://github.com/salesforcecli/sf-plugins-core/commit/30930b74ff5e6b59116228d547362a284ad98388))
+* error can't be spread ([30930b7](https://github.com/salesforcecli/sf-plugins-core/commit/30930b74ff5e6b59116228d547362a284ad98388))
+
 
 ### Features
 
-- catch method supports base and SfError ([2b9a038](https://github.com/salesforcecli/sf-plugins-core/commit/2b9a038713c77e1230e21f5cc6f8ae2a6aaab5be))
+* catch method supports base and SfError ([2b9a038](https://github.com/salesforcecli/sf-plugins-core/commit/2b9a038713c77e1230e21f5cc6f8ae2a6aaab5be))
+
+
 
 ## [1.12.3](https://github.com/salesforcecli/sf-plugins-core/compare/v1.12.2...v1.12.3) (2022-05-04)
 
+
 ### Bug Fixes
 
-- prevent multiple starts of progress bar ([8ec788c](https://github.com/salesforcecli/sf-plugins-core/commit/8ec788cfda452d2c227631fde64e01786f6f6a49))
-- stop using once ([970fb80](https://github.com/salesforcecli/sf-plugins-core/commit/970fb808ad14a8d8bce0daabd78854c4a046e621))
+* prevent multiple starts of progress bar ([8ec788c](https://github.com/salesforcecli/sf-plugins-core/commit/8ec788cfda452d2c227631fde64e01786f6f6a49))
+* stop using once ([970fb80](https://github.com/salesforcecli/sf-plugins-core/commit/970fb808ad14a8d8bce0daabd78854c4a046e621))
+
+
 
 ## [1.12.2](https://github.com/salesforcecli/sf-plugins-core/compare/v1.12.1...v1.12.2) (2022-05-03)
 
+
 ### Bug Fixes
 
-- update error message ([182cfa3](https://github.com/salesforcecli/sf-plugins-core/commit/182cfa30beb4e7fe052a0453d141e19ba7129647))
+* update error message ([182cfa3](https://github.com/salesforcecli/sf-plugins-core/commit/182cfa30beb4e7fe052a0453d141e19ba7129647))
+
+
 
 ## [1.12.1](https://github.com/salesforcecli/sf-plugins-core/compare/v1.12.0...v1.12.1) (2022-04-20)
 
+
 ### Bug Fixes
 
-- update config vars ([0c557b5](https://github.com/salesforcecli/sf-plugins-core/commit/0c557b59f6b833a6fe2812d9a765a2f006f57b01))
+* update config vars ([0c557b5](https://github.com/salesforcecli/sf-plugins-core/commit/0c557b59f6b833a6fe2812d9a765a2f006f57b01))
+
+
 
 # [1.12.0](https://github.com/salesforcecli/sf-plugins-core/compare/v1.11.3...v1.12.0) (2022-04-18)
 
+
 ### Features
 
-- adjusting message colors for accessibility ([6f873da](https://github.com/salesforcecli/sf-plugins-core/commit/6f873daf2e05c2ec0b52b357b15333a3b68e106e))
+* adjusting message colors for accessibility ([6f873da](https://github.com/salesforcecli/sf-plugins-core/commit/6f873daf2e05c2ec0b52b357b15333a3b68e106e))
+
+
 
 ## [1.11.3](https://github.com/salesforcecli/sf-plugins-core/compare/v1.11.2...v1.11.3) (2022-04-12)
 
+
 ### Bug Fixes
 
-- need await in order for the catch to be effective ([2805578](https://github.com/salesforcecli/sf-plugins-core/commit/28055783503177667620528b6246b252ff10cb7f))
+* need await in order for the catch to be effective ([2805578](https://github.com/salesforcecli/sf-plugins-core/commit/28055783503177667620528b6246b252ff10cb7f))
+
+
 
 ## [1.11.2](https://github.com/salesforcecli/sf-plugins-core/compare/v1.11.1...v1.11.2) (2022-04-11)
 
+
 ### Bug Fixes
 
-- optional orgs can be undefined ([412629d](https://github.com/salesforcecli/sf-plugins-core/commit/412629de689d7d73b7c2b0673b8e9b373cc957bc))
-- throw if input provided but no org found ([10be468](https://github.com/salesforcecli/sf-plugins-core/commit/10be468c0c3e164fed171c947dbe437b2325605c))
+* optional orgs can be undefined ([412629d](https://github.com/salesforcecli/sf-plugins-core/commit/412629de689d7d73b7c2b0673b8e9b373cc957bc))
+* throw if input provided but no org found ([10be468](https://github.com/salesforcecli/sf-plugins-core/commit/10be468c0c3e164fed171c947dbe437b2325605c))
+
+
 
 ## [1.11.1](https://github.com/salesforcecli/sf-plugins-core/compare/v1.11.0...v1.11.1) (2022-04-07)
 
+
 ### Bug Fixes
 
-- adjust message formats ([5b62ced](https://github.com/salesforcecli/sf-plugins-core/commit/5b62cedeb522c08dcce01159a22060be72c1bf62))
+* adjust message formats ([5b62ced](https://github.com/salesforcecli/sf-plugins-core/commit/5b62cedeb522c08dcce01159a22060be72c1bf62))
+
+
 
 # [1.11.0](https://github.com/salesforcecli/sf-plugins-core/compare/v1.10.0...v1.11.0) (2022-03-31)
 
+
 ### Features
 
-- support error codes help section ([4852a4f](https://github.com/salesforcecli/sf-plugins-core/commit/4852a4f75bcc744febf276293ed5bf45080436e6))
+* support error codes help section ([4852a4f](https://github.com/salesforcecli/sf-plugins-core/commit/4852a4f75bcc744febf276293ed5bf45080436e6))
+
+
 
 # [1.10.0](https://github.com/salesforcecli/sf-plugins-core/compare/v1.9.0...v1.10.0) (2022-03-31)
 
+
 ### Features
 
-- warn users when using a beta command ([2cf26f2](https://github.com/salesforcecli/sf-plugins-core/commit/2cf26f2d363a40b0739f082bfe4aedd62fd4531f))
+* warn users when using a beta command ([2cf26f2](https://github.com/salesforcecli/sf-plugins-core/commit/2cf26f2d363a40b0739f082bfe4aedd62fd4531f))
+
+
 
 # [1.9.0](https://github.com/salesforcecli/sf-plugins-core/compare/v1.8.1...v1.9.0) (2022-03-24)
 
+
 ### Features
 
-- explain what a valid api version looks like ([4c5669a](https://github.com/salesforcecli/sf-plugins-core/commit/4c5669a969ef79eae1d4aec76f6cb20df92aae5e))
+* explain what a valid api version looks like ([4c5669a](https://github.com/salesforcecli/sf-plugins-core/commit/4c5669a969ef79eae1d4aec76f6cb20df92aae5e))
+
+
 
 ## [1.8.1](https://github.com/salesforcecli/sf-plugins-core/compare/v1.8.0...v1.8.1) (2022-03-24)
 
+
 ### Bug Fixes
 
-- log errors to stderr ([9958d8e](https://github.com/salesforcecli/sf-plugins-core/commit/9958d8e49cf1fbe514026491d8d095651d1cb88b))
+* log errors to stderr ([9958d8e](https://github.com/salesforcecli/sf-plugins-core/commit/9958d8e49cf1fbe514026491d8d095651d1cb88b))
+
+
 
 # [1.8.0](https://github.com/salesforcecli/sf-plugins-core/compare/v1.7.2...v1.8.0) (2022-03-17)
 
+
 ### Bug Fixes
 
-- better checking of hub ([8c92bfe](https://github.com/salesforcecli/sf-plugins-core/commit/8c92bfed8f0600ff03489abbb253b5b95c95128a))
-- no unused, respects timeout ([c41c43e](https://github.com/salesforcecli/sf-plugins-core/commit/c41c43e5c480dc1dd914a86ec8c97a8af41369a1))
-- use OptionFlag interface so that exactlyOne can be used ([0e65453](https://github.com/salesforcecli/sf-plugins-core/commit/0e65453dacb68a90f4af2387e571edbd4077ba1b))
+* better checking of hub ([8c92bfe](https://github.com/salesforcecli/sf-plugins-core/commit/8c92bfed8f0600ff03489abbb253b5b95c95128a))
+* no unused, respects timeout ([c41c43e](https://github.com/salesforcecli/sf-plugins-core/commit/c41c43e5c480dc1dd914a86ec8c97a8af41369a1))
+* use OptionFlag interface so that exactlyOne can be used ([0e65453](https://github.com/salesforcecli/sf-plugins-core/commit/0e65453dacb68a90f4af2387e571edbd4077ba1b))
+
 
 ### Features
 
-- confirms are timed ([9c89ee9](https://github.com/salesforcecli/sf-plugins-core/commit/9c89ee99901c7abefc11a811e8e4dda0c704ed1c))
-- simplified confirm prompts ([ddf1364](https://github.com/salesforcecli/sf-plugins-core/commit/ddf1364a48fb384bd0ad66bc310a35abcef20d68))
+* confirms are timed ([9c89ee9](https://github.com/salesforcecli/sf-plugins-core/commit/9c89ee99901c7abefc11a811e8e4dda0c704ed1c))
+* simplified confirm prompts ([ddf1364](https://github.com/salesforcecli/sf-plugins-core/commit/ddf1364a48fb384bd0ad66bc310a35abcef20d68))
+
+
 
 ## [1.7.2](https://github.com/salesforcecli/sf-plugins-core/compare/v1.7.1...v1.7.2) (2022-03-15)
 
+
 ### Bug Fixes
 
-- need to pass ms to timedPrompt function ([f285e07](https://github.com/salesforcecli/sf-plugins-core/commit/f285e07525937798d0251da69c86c05cc683edfd))
+* need to pass ms to timedPrompt function ([f285e07](https://github.com/salesforcecli/sf-plugins-core/commit/f285e07525937798d0251da69c86c05cc683edfd))
+
+
 
 ## [1.7.1](https://github.com/salesforcecli/sf-plugins-core/compare/v1.7.0...v1.7.1) (2022-03-11)
 
+
 ### Bug Fixes
 
-- add oclif enum to exports ([71ee6ac](https://github.com/salesforcecli/sf-plugins-core/commit/71ee6ac7942790ffc519512ade67330614ada51b))
-- expose timed prompt in command class ([3b056c6](https://github.com/salesforcecli/sf-plugins-core/commit/3b056c668d3379ada6f85e2e5b5f6da76c1a3223))
+* add oclif enum to exports ([71ee6ac](https://github.com/salesforcecli/sf-plugins-core/commit/71ee6ac7942790ffc519512ade67330614ada51b))
+* expose timed prompt in command class ([3b056c6](https://github.com/salesforcecli/sf-plugins-core/commit/3b056c668d3379ada6f85e2e5b5f6da76c1a3223))
+
+
 
 # [1.7.0](https://github.com/salesforcecli/sf-plugins-core/compare/v1.6.1...v1.7.0) (2022-03-11)
 
+
 ### Features
 
-- suppress progress bar output with env vars ([d2e8a84](https://github.com/salesforcecli/sf-plugins-core/commit/d2e8a849d7ca93b3dba538a26ce5f9ab7f858984))
+* suppress progress bar output with env vars ([d2e8a84](https://github.com/salesforcecli/sf-plugins-core/commit/d2e8a849d7ca93b3dba538a26ce5f9ab7f858984))
+
+
 
 ## [1.6.1](https://github.com/salesforcecli/sf-plugins-core/compare/v1.6.0...v1.6.1) (2022-03-09)
 
+
 ### Bug Fixes
 
-- erturn error - dont throw ([0ea70bc](https://github.com/salesforcecli/sf-plugins-core/commit/0ea70bc12cecd380a907323eba84ddb9d5a44e08))
+* erturn error - dont throw ([0ea70bc](https://github.com/salesforcecli/sf-plugins-core/commit/0ea70bc12cecd380a907323eba84ddb9d5a44e08))
+
+
 
 # [1.6.0](https://github.com/salesforcecli/sf-plugins-core/compare/v1.5.3...v1.6.0) (2022-03-08)
 
+
 ### Features
 
-- add timedPrompt method ([ea9e98c](https://github.com/salesforcecli/sf-plugins-core/commit/ea9e98c5bffdfc1e917d61006a91f4dba1f808f3))
+* add timedPrompt method ([ea9e98c](https://github.com/salesforcecli/sf-plugins-core/commit/ea9e98c5bffdfc1e917d61006a91f4dba1f808f3))
+
+
 
 ## [1.5.3](https://github.com/salesforcecli/sf-plugins-core/compare/v1.5.2...v1.5.3) (2022-03-08)
 
+
 ### Bug Fixes
 
-- expose styledHeader as func in sf command ([fd2dc48](https://github.com/salesforcecli/sf-plugins-core/commit/fd2dc48444be224a884c3b56d5604f4b854f1c0e))
+* expose styledHeader as func in sf command ([fd2dc48](https://github.com/salesforcecli/sf-plugins-core/commit/fd2dc48444be224a884c3b56d5604f4b854f1c0e))
+
+
 
 ## [1.5.2](https://github.com/salesforcecli/sf-plugins-core/compare/v1.5.1...v1.5.2) (2022-03-07)
 
+
 ### Bug Fixes
 
-- add styled header function to sf command ([5cc0e8b](https://github.com/salesforcecli/sf-plugins-core/commit/5cc0e8bf60774918c2ebaf2ba5b465f3dd6caf15))
-- retrhow ([eaebd44](https://github.com/salesforcecli/sf-plugins-core/commit/eaebd44d0028cedab92173ed30050757602d2c28))
+* add styled header function to sf command ([5cc0e8b](https://github.com/salesforcecli/sf-plugins-core/commit/5cc0e8bf60774918c2ebaf2ba5b465f3dd6caf15))
+* retrhow ([eaebd44](https://github.com/salesforcecli/sf-plugins-core/commit/eaebd44d0028cedab92173ed30050757602d2c28))
+
+
 
 ## [1.5.1](https://github.com/salesforcecli/sf-plugins-core/compare/v1.5.0...v1.5.1) (2022-03-07)
 
+
+
 # [1.5.0](https://github.com/salesforcecli/sf-plugins-core/compare/v1.4.1...v1.5.0) (2022-03-03)
 
+
 ### Features
 
-- friendly default help for org flags ([f4d55b3](https://github.com/salesforcecli/sf-plugins-core/commit/f4d55b30c08e988c0231b97acce8ba2bc9733a06))
+* friendly default help for org flags ([f4d55b3](https://github.com/salesforcecli/sf-plugins-core/commit/f4d55b30c08e988c0231b97acce8ba2bc9733a06))
+
+
 
 ## [1.4.1](https://github.com/salesforcecli/sf-plugins-core/compare/v1.4.0...v1.4.1) (2022-03-02)
 
+
 ### Bug Fixes
 
-- make toHelpSection types more friendly ([add364b](https://github.com/salesforcecli/sf-plugins-core/commit/add364b6be532dae6fb49f62164dad486b186347))
+* make toHelpSection types more friendly ([add364b](https://github.com/salesforcecli/sf-plugins-core/commit/add364b6be532dae6fb49f62164dad486b186347))
+
+
 
 # [1.4.0](https://github.com/salesforcecli/sf-plugins-core/compare/v1.3.0...v1.4.0) (2022-03-02)
 
+
 ### Bug Fixes
 
-- error keys support createError ([f094c49](https://github.com/salesforcecli/sf-plugins-core/commit/f094c49f1ec1063fb05cdc74e1aab88e7ceb7f13))
-- error message doesn't take params ([5d917bf](https://github.com/salesforcecli/sf-plugins-core/commit/5d917bf100d41077d2eaabcd89c41fa049ef6f21))
-- wrong error name ([1b3bbbe](https://github.com/salesforcecli/sf-plugins-core/commit/1b3bbbeae9f3e888faf438fe8d1f4bfd6bdac2c9))
+* error keys support createError ([f094c49](https://github.com/salesforcecli/sf-plugins-core/commit/f094c49f1ec1063fb05cdc74e1aab88e7ceb7f13))
+* error message doesn't take params ([5d917bf](https://github.com/salesforcecli/sf-plugins-core/commit/5d917bf100d41077d2eaabcd89c41fa049ef6f21))
+* wrong error name ([1b3bbbe](https://github.com/salesforcecli/sf-plugins-core/commit/1b3bbbeae9f3e888faf438fe8d1f4bfd6bdac2c9))
+
 
 ### Features
 
-- common salesforce flags ([00ab4fc](https://github.com/salesforcecli/sf-plugins-core/commit/00ab4fc94d268b44dccb6a2de02fe4f720ff0fc0))
-- debugging ([cc3fd1e](https://github.com/salesforcecli/sf-plugins-core/commit/cc3fd1e46134c08a4d76e79c74605e90e09abbb3))
-- duration flag ([b11eaab](https://github.com/salesforcecli/sf-plugins-core/commit/b11eaabb0050961094f412d85c2bbbf4b183cd40))
+* common salesforce flags ([00ab4fc](https://github.com/salesforcecli/sf-plugins-core/commit/00ab4fc94d268b44dccb6a2de02fe4f720ff0fc0))
+* debugging ([cc3fd1e](https://github.com/salesforcecli/sf-plugins-core/commit/cc3fd1e46134c08a4d76e79c74605e90e09abbb3))
+* duration flag ([b11eaab](https://github.com/salesforcecli/sf-plugins-core/commit/b11eaabb0050961094f412d85c2bbbf4b183cd40))
+
+
 
 # [1.3.0](https://github.com/salesforcecli/sf-plugins-core/compare/v1.2.1...v1.3.0) (2022-02-23)
 
+
 ### Features
 
-- add requiresProject property ([5ff0cf3](https://github.com/salesforcecli/sf-plugins-core/commit/5ff0cf34fffe896e1ed312585705ff13436e58cf))
+* add requiresProject property ([5ff0cf3](https://github.com/salesforcecli/sf-plugins-core/commit/5ff0cf34fffe896e1ed312585705ff13436e58cf))
+
+
 
 ## [1.2.1](https://github.com/salesforcecli/sf-plugins-core/compare/v1.2.0...v1.2.1) (2022-01-27)
 
+
 ### Bug Fixes
 
-- protect against non-existent bar ([2d0dc37](https://github.com/salesforcecli/sf-plugins-core/commit/2d0dc37ce7fedfee4413ae91299de11c8cd9db93))
+* protect against non-existent bar ([2d0dc37](https://github.com/salesforcecli/sf-plugins-core/commit/2d0dc37ce7fedfee4413ae91299de11c8cd9db93))
+
+
 
 # [1.2.0](https://github.com/salesforcecli/sf-plugins-core/compare/v1.1.0...v1.2.0) (2022-01-27)
 
+
 ### Features
 
-- expose ux methods in SfCommand ([8e58a93](https://github.com/salesforcecli/sf-plugins-core/commit/8e58a93a942d5a0305a77a82e938f778c59fcd16))
+* expose ux methods in SfCommand ([8e58a93](https://github.com/salesforcecli/sf-plugins-core/commit/8e58a93a942d5a0305a77a82e938f778c59fcd16))
+
+
 
 # [1.1.0](https://github.com/salesforcecli/sf-plugins-core/compare/v1.0.5...v1.1.0) (2022-01-03)
 
+
 ### Bug Fixes
 
-- add status method ([9cf2069](https://github.com/salesforcecli/sf-plugins-core/commit/9cf20694d76e2509785b7c8faa4bd63ab190707e))
-- make status a getter/setter ([441c55a](https://github.com/salesforcecli/sf-plugins-core/commit/441c55acd3d811664213e9801a8bcc270e3aca7b))
+* add status method ([9cf2069](https://github.com/salesforcecli/sf-plugins-core/commit/9cf20694d76e2509785b7c8faa4bd63ab190707e))
+* make status a getter/setter ([441c55a](https://github.com/salesforcecli/sf-plugins-core/commit/441c55acd3d811664213e9801a8bcc270e3aca7b))
+
 
 ### Features
 
-- add spinner methods ([f209f8f](https://github.com/salesforcecli/sf-plugins-core/commit/f209f8f4e6736b9de91e37f865d66b5356e5abec))
+* add spinner methods ([f209f8f](https://github.com/salesforcecli/sf-plugins-core/commit/f209f8f4e6736b9de91e37f865d66b5356e5abec))
+
+
 
 ## [1.0.5](https://github.com/salesforcecli/sf-plugins-core/compare/v1.0.4...v1.0.5) (2021-12-16)
 
+
 ### Bug Fixes
 
-- bump dependencies ([4f78d8c](https://github.com/salesforcecli/sf-plugins-core/commit/4f78d8c940aab41bb406c45a9df98f686e626d28))
+* bump dependencies ([4f78d8c](https://github.com/salesforcecli/sf-plugins-core/commit/4f78d8c940aab41bb406c45a9df98f686e626d28))
+
+
 
 ## [1.0.4](https://github.com/salesforcecli/sf-plugins-core/compare/v1.0.3...v1.0.4) (2021-10-13)
 
+
 ### Bug Fixes
 
-- bump module versions ([abdf5e3](https://github.com/salesforcecli/sf-plugins-core/commit/abdf5e37205b464a36393ca1887ce90a7c1ba302))
+* bump module versions ([abdf5e3](https://github.com/salesforcecli/sf-plugins-core/commit/abdf5e37205b464a36393ca1887ce90a7c1ba302))
+
+
 
 ## [1.0.3](https://github.com/salesforcecli/sf-plugins-core/compare/v1.0.2...v1.0.3) (2021-10-12)
 
+
+
 ## [1.0.2](https://github.com/salesforcecli/sf-plugins-core/compare/v1.0.1...v1.0.2) (2021-10-11)
 
+
 ### Bug Fixes
 
-- bump oclif and sfdx-core versions ([3d38a70](https://github.com/salesforcecli/sf-plugins-core/commit/3d38a70dcad79aa151529bf51d281f68fe92a3ce))
+* bump oclif and sfdx-core versions ([3d38a70](https://github.com/salesforcecli/sf-plugins-core/commit/3d38a70dcad79aa151529bf51d281f68fe92a3ce))
+
+
 
 ## [1.0.1](https://github.com/salesforcecli/sf-plugins-core/compare/v1.0.0...v1.0.1) (2021-10-06)
 
+
 ### Bug Fixes
 
-- update inquirer ([067bbfb](https://github.com/salesforcecli/sf-plugins-core/commit/067bbfbbfcd271ae25260e6b83452093b1fe4deb))
+* update inquirer ([067bbfb](https://github.com/salesforcecli/sf-plugins-core/commit/067bbfbbfcd271ae25260e6b83452093b1fe4deb))
+
+
 
 # [1.0.0](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.28...v1.0.0) (2021-09-29)
 
+
+
 ## [0.0.28](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.27...v0.0.28) (2021-09-29)
 
+
 ### Bug Fixes
 
-- allow empty message in logSensitive ([5b8edf5](https://github.com/salesforcecli/sf-plugins-core/commit/5b8edf509647887500d9e71b506939b3cc6945d9))
+* allow empty message in logSensitive ([5b8edf5](https://github.com/salesforcecli/sf-plugins-core/commit/5b8edf509647887500d9e71b506939b3cc6945d9))
+
+
 
 ## [0.0.27](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.26...v0.0.27) (2021-09-29)
 
+
 ### Bug Fixes
 
-- publish messages ([91a6aa6](https://github.com/salesforcecli/sf-plugins-core/commit/91a6aa6c396f9b33049407820d0b8bd9caaa30f4))
+* publish messages ([91a6aa6](https://github.com/salesforcecli/sf-plugins-core/commit/91a6aa6c396f9b33049407820d0b8bd9caaa30f4))
+
+
 
 ## [0.0.26](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.25...v0.0.26) (2021-09-29)
 
+
 ### Features
 
-- logSensitive, capture warnings ([a8b3e76](https://github.com/salesforcecli/sf-plugins-core/commit/a8b3e76ff20806b136ee606797b84a70c8f5a528))
+* logSensitive, capture warnings ([a8b3e76](https://github.com/salesforcecli/sf-plugins-core/commit/a8b3e76ff20806b136ee606797b84a70c8f5a528))
+
+
 
 ## [0.0.25](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.24...v0.0.25) (2021-09-21)
 
+
 ### Bug Fixes
 
-- add envirnment type to env list ([8f020df](https://github.com/salesforcecli/sf-plugins-core/commit/8f020dfc8695be19a7fd1f4b811b8c2b8c321418))
+* add envirnment type to env list ([8f020df](https://github.com/salesforcecli/sf-plugins-core/commit/8f020dfc8695be19a7fd1f4b811b8c2b8c321418))
+
+
 
 ## [0.0.24](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.23...v0.0.24) (2021-09-16)
 
+
 ### Bug Fixes
 
-- allow null for EnvDisplay ([0868d3f](https://github.com/salesforcecli/sf-plugins-core/commit/0868d3f0ed23e28c53ce11cb447e41b9b0144ac1))
+* allow null for EnvDisplay ([0868d3f](https://github.com/salesforcecli/sf-plugins-core/commit/0868d3f0ed23e28c53ce11cb447e41b9b0144ac1))
+
+
 
 ## [0.0.23](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.22...v0.0.23) (2021-09-15)
 
+
 ### Bug Fixes
 
-- update to latest oclif/core and enable json flag ([b486ef1](https://github.com/salesforcecli/sf-plugins-core/commit/b486ef173b27ba465cc8fddf53e3a53d339f8734))
+* update to latest oclif/core and enable json flag ([b486ef1](https://github.com/salesforcecli/sf-plugins-core/commit/b486ef173b27ba465cc8fddf53e3a53d339f8734))
+
+
 
 ## [0.0.22](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.21...v0.0.22) (2021-09-15)
 
+
 ### Bug Fixes
 
-- bump oclif/core ([c7a07f7](https://github.com/salesforcecli/sf-plugins-core/commit/c7a07f7671699197f3db93ec750e009eb9dfd56f))
+* bump oclif/core ([c7a07f7](https://github.com/salesforcecli/sf-plugins-core/commit/c7a07f7671699197f3db93ec750e009eb9dfd56f))
+
+
 
 ## [0.0.21](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.20...v0.0.21) (2021-09-14)
 
+
 ### Bug Fixes
 
-- move sf command to this repo ([968f80f](https://github.com/salesforcecli/sf-plugins-core/commit/968f80f0b8aecd0d47fe8d428c605117828f886f))
+* move sf command to this repo ([968f80f](https://github.com/salesforcecli/sf-plugins-core/commit/968f80f0b8aecd0d47fe8d428c605117828f886f))
+
+
 
 ## [0.0.20](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.19...v0.0.20) (2021-09-14)
 
+
+
 ## [0.0.19](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.18...v0.0.19) (2021-09-13)
 
+
 ### Features
 
-- add logout hook ([4a4d79b](https://github.com/salesforcecli/sf-plugins-core/commit/4a4d79bcd9f2017e70f75967bb0661ae3eb4aa4a))
+* add logout hook ([4a4d79b](https://github.com/salesforcecli/sf-plugins-core/commit/4a4d79bcd9f2017e70f75967bb0661ae3eb4aa4a))
+
+
 
 ## [0.0.18](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.17...v0.0.18) (2021-09-10)
 
+
 ### Bug Fixes
 
-- missed export ([63086ae](https://github.com/salesforcecli/sf-plugins-core/commit/63086aee3dc26c6f674c0bad8054205ed3992597))
+* missed export ([63086ae](https://github.com/salesforcecli/sf-plugins-core/commit/63086aee3dc26c6f674c0bad8054205ed3992597))
+
+
 
 ## [0.0.17](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.16...v0.0.17) (2021-09-10)
 
+
 ### Features
 
-- add help section helper function ([379d14f](https://github.com/salesforcecli/sf-plugins-core/commit/379d14f45eedc46736f64bb5c37a7f906e235d4c))
+* add help section helper function ([379d14f](https://github.com/salesforcecli/sf-plugins-core/commit/379d14f45eedc46736f64bb5c37a7f906e235d4c))
+
+
 
 ## [0.0.16](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.15...v0.0.16) (2021-09-08)
 
+
 ### Bug Fixes
 
-- bump oclif/core ([1cd3df6](https://github.com/salesforcecli/sf-plugins-core/commit/1cd3df66dde4d1e5386221e892aa01a7d504261c))
+* bump oclif/core ([1cd3df6](https://github.com/salesforcecli/sf-plugins-core/commit/1cd3df66dde4d1e5386221e892aa01a7d504261c))
+
+
 
 ## [0.0.15](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.14...v0.0.15) (2021-08-31)
 
+
 ### Bug Fixes
 
-- improve jsdocs ([e3e3784](https://github.com/salesforcecli/sf-plugins-core/commit/e3e3784954fc2d6b06f96459c824cf77795a9de9))
-- improve jsdocs ([aefdd06](https://github.com/salesforcecli/sf-plugins-core/commit/aefdd06b164d413b3f3c4d51b36dea475efcc3ef))
+* improve jsdocs ([e3e3784](https://github.com/salesforcecli/sf-plugins-core/commit/e3e3784954fc2d6b06f96459c824cf77795a9de9))
+* improve jsdocs ([aefdd06](https://github.com/salesforcecli/sf-plugins-core/commit/aefdd06b164d413b3f3c4d51b36dea475efcc3ef))
+
+
 
 ## [0.0.14](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.13...v0.0.14) (2021-08-31)
 
+
 ### Bug Fixes
 
-- improve env types ([e7a7c1d](https://github.com/salesforcecli/sf-plugins-core/commit/e7a7c1df001d02b60c31bcbe5abe4ab31d5faf8d))
+* improve env types ([e7a7c1d](https://github.com/salesforcecli/sf-plugins-core/commit/e7a7c1df001d02b60c31bcbe5abe4ab31d5faf8d))
+
+
 
 ## [0.0.13](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.12...v0.0.13) (2021-08-30)
 
+
 ### Bug Fixes
 
-- update exports ([548ab46](https://github.com/salesforcecli/sf-plugins-core/commit/548ab4646bd1e2d79dbda0609551e6f805b69d09))
+* update exports ([548ab46](https://github.com/salesforcecli/sf-plugins-core/commit/548ab4646bd1e2d79dbda0609551e6f805b69d09))
+
+
 
 ## [0.0.12](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.11...v0.0.12) (2021-08-30)
 
+
 ### Features
 
-- support env display ([446af15](https://github.com/salesforcecli/sf-plugins-core/commit/446af15385ed57e7d5ebd40c4a4964b2bf326e16))
+* support env display ([446af15](https://github.com/salesforcecli/sf-plugins-core/commit/446af15385ed57e7d5ebd40c4a4964b2bf326e16))
+
+
 
 ## [0.0.11](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.10...v0.0.11) (2021-08-30)
 
+
 ### Features
 
-- rename to sf-plugins-core ([e51d6aa](https://github.com/salesforcecli/sf-plugins-core/commit/e51d6aa6879c085ae9efac990d6d406a79615088))
+* rename to sf-plugins-core ([e51d6aa](https://github.com/salesforcecli/sf-plugins-core/commit/e51d6aa6879c085ae9efac990d6d406a79615088))
+
+
 
 ## [0.0.10](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.9...v0.0.10) (2021-08-10)
 
+
 ### Bug Fixes
 
-- correct header to data column alignment ([a6d1baf](https://github.com/salesforcecli/sf-plugins-core/commit/a6d1bafd098443dcb4381f03fd7283594d263c8d))
+* correct header to data column alignment ([a6d1baf](https://github.com/salesforcecli/sf-plugins-core/commit/a6d1bafd098443dcb4381f03fd7283594d263c8d))
+
+
 
 ## [0.0.9](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.8...v0.0.9) (2021-07-15)
 
+
 ### Bug Fixes
 
-- rename ProjectDeployOptions to DeployOptions ([eafefcf](https://github.com/salesforcecli/sf-plugins-core/commit/eafefcfb55f73e96e2b0b08bb3129b6aa0fb6571))
+* rename ProjectDeployOptions to DeployOptions ([eafefcf](https://github.com/salesforcecli/sf-plugins-core/commit/eafefcfb55f73e96e2b0b08bb3129b6aa0fb6571))
+
+
 
 ## [0.0.8](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.7...v0.0.8) (2021-07-15)
 
+
+
 ## [0.0.7](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.6...v0.0.7) (2021-07-01)
 
+
 ### Features
 
-- support deploy file ([99b4a81](https://github.com/salesforcecli/sf-plugins-core/commit/99b4a81b1a844714233a30679ae267c6866ba4a2))
+* support deploy file ([99b4a81](https://github.com/salesforcecli/sf-plugins-core/commit/99b4a81b1a844714233a30679ae267c6866ba4a2))
+
+
 
 ## [0.0.6](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.5...v0.0.6) (2021-06-28)
 
+
 ### Bug Fixes
 
-- allow empty log message ([1272215](https://github.com/salesforcecli/sf-plugins-core/commit/1272215b62a35e89072df2f02c1bab6c2999e056))
+* allow empty log message ([1272215](https://github.com/salesforcecli/sf-plugins-core/commit/1272215b62a35e89072df2f02c1bab6c2999e056))
+
+
 
 ## [0.0.5](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.4...v0.0.5) (2021-06-28)
 
+
 ### Features
 
-- add Prompter class ([7f7861f](https://github.com/salesforcecli/sf-plugins-core/commit/7f7861f68dc74d815a1bf2d668edd719496524ff))
+* add Prompter class ([7f7861f](https://github.com/salesforcecli/sf-plugins-core/commit/7f7861f68dc74d815a1bf2d668edd719496524ff))
+
+
 
 ## [0.0.4](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.3...v0.0.4) (2021-06-28)
 
+
 ### Bug Fixes
 
-- update Options type ([f24a800](https://github.com/salesforcecli/sf-plugins-core/commit/f24a800409e026605f08717cd572e89afcdf35d0))
+* update Options type ([f24a800](https://github.com/salesforcecli/sf-plugins-core/commit/f24a800409e026605f08717cd572e89afcdf35d0))
+
+
 
 ## [0.0.3](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.2...v0.0.3) (2021-06-28)
 
+
 ### Features
 
-- add Deployables class ([0405a6b](https://github.com/salesforcecli/sf-plugins-core/commit/0405a6bdc78cf44237e1bd51efb2199c275678ca))
+* add Deployables class ([0405a6b](https://github.com/salesforcecli/sf-plugins-core/commit/0405a6bdc78cf44237e1bd51efb2199c275678ca))
+
+
 
 ## [0.0.2](https://github.com/salesforcecli/sf-plugins-core/compare/v0.0.1...v0.0.2) (2021-06-24)
 
+
+
 ## [0.0.1](https://github.com/salesforcecli/sf-plugins-core/compare/fbfee1eb223c67ead31dfd6da65ed6d55c83015d...v0.0.1) (2021-06-24)
 
+
 ### Features
 
-- deployer interface ([fbfee1e](https://github.com/salesforcecli/sf-plugins-core/commit/fbfee1eb223c67ead31dfd6da65ed6d55c83015d))
+* deployer interface ([fbfee1e](https://github.com/salesforcecli/sf-plugins-core/commit/fbfee1eb223c67ead31dfd6da65ed6d55c83015d))
+
+
+
diff --git a/package.json b/package.json
index d5d25bba..3b19916c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/sf-plugins-core",
-  "version": "2.2.8",
+  "version": "2.2.9",
   "description": "Utils for writing Salesforce CLI plugins",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -144,4 +144,4 @@
       "output": []
     }
   }
-}
+}
\ No newline at end of file

From 9182f86a74a54bf2991fd3b5f8ef147cfc84fc10 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 22 Apr 2023 19:57:34 +0000
Subject: [PATCH 15/23] chore(dev-deps): bump eslint from 8.38.0 to 8.39.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.38.0 to 8.39.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.38.0...v8.39.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 3b19916c..d4b4069b 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "@typescript-eslint/eslint-plugin": "^5.58.0",
     "@typescript-eslint/parser": "^5.58.0",
     "chai": "^4.3.7",
-    "eslint": "^8.38.0",
+    "eslint": "^8.39.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-config-salesforce": "^1.2.0",
     "eslint-config-salesforce-license": "^0.2.0",
diff --git a/yarn.lock b/yarn.lock
index 571d0b5e..03a36214 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -429,10 +429,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.38.0":
-  version "8.38.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.38.0.tgz#73a8a0d8aa8a8e6fe270431c5e72ae91b5337892"
-  integrity sha512-IoD2MfUnOV58ghIHCiil01PcohxjbYR/qCxsoC+xNgUwh1EY8jOOrYmu3d3a71+tJJ23uscEV4X2HJWMsPJu4g==
+"@eslint/js@8.39.0":
+  version "8.39.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.39.0.tgz#58b536bcc843f4cd1e02a7e6171da5c040f4d44b"
+  integrity sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==
 
 "@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3":
   version "1.1.3"
@@ -2882,10 +2882,10 @@ eslint-scope@^5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-scope@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
-  integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
+eslint-scope@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.0.tgz#f21ebdafda02352f103634b96dd47d9f81ca117b"
+  integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
@@ -2895,15 +2895,15 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz#c7f0f956124ce677047ddbc192a68f999454dedc"
   integrity sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==
 
-eslint@^8.32.0, eslint@^8.38.0:
-  version "8.38.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.38.0.tgz#a62c6f36e548a5574dd35728ac3c6209bd1e2f1a"
-  integrity sha512-pIdsD2jwlUGf/U38Jv97t8lq6HpaU/G9NKbYmpWpZGw3LdTNhZLbJePqxOXGB5+JEKfOPU/XLxYxFh03nr1KTg==
+eslint@^8.32.0, eslint@^8.39.0:
+  version "8.39.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.39.0.tgz#7fd20a295ef92d43809e914b70c39fd5a23cf3f1"
+  integrity sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.4.0"
     "@eslint/eslintrc" "^2.0.2"
-    "@eslint/js" "8.38.0"
+    "@eslint/js" "8.39.0"
     "@humanwhocodes/config-array" "^0.11.8"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
@@ -2913,7 +2913,7 @@ eslint@^8.32.0, eslint@^8.38.0:
     debug "^4.3.2"
     doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.1.1"
+    eslint-scope "^7.2.0"
     eslint-visitor-keys "^3.4.0"
     espree "^9.5.1"
     esquery "^1.4.2"

From e73c7341ba571ed4a44020b0c1d1ac5271dbf980 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 22 Apr 2023 19:57:47 +0000
Subject: [PATCH 16/23] chore(dev-deps): bump @oclif/test from 2.3.15 to 2.3.16

Bumps [@oclif/test](https://github.com/oclif/test) from 2.3.15 to 2.3.16.
- [Release notes](https://github.com/oclif/test/releases)
- [Changelog](https://github.com/oclif/test/blob/main/CHANGELOG.md)
- [Commits](https://github.com/oclif/test/compare/2.3.15...2.3.16)

---
updated-dependencies:
- dependency-name: "@oclif/test"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 3b19916c..ac65c7f0 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "inquirer": "^8.2.5"
   },
   "devDependencies": {
-    "@oclif/test": "^2.3.14",
+    "@oclif/test": "^2.3.16",
     "@salesforce/dev-config": "^3.1.0",
     "@salesforce/dev-scripts": "^4.1.3",
     "@salesforce/prettier-config": "^0.0.2",
diff --git a/yarn.lock b/yarn.lock
index 571d0b5e..baeb5d6c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -675,7 +675,7 @@
     supports-color "^8.1.1"
     tslib "^2"
 
-"@oclif/core@^2.1.7", "@oclif/core@^2.3.0", "@oclif/core@^2.3.1", "@oclif/core@^2.8.0", "@oclif/core@^2.8.2":
+"@oclif/core@^2.1.7", "@oclif/core@^2.3.0", "@oclif/core@^2.3.1", "@oclif/core@^2.8.2":
   version "2.8.2"
   resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.8.2.tgz#86fc31f20419dbb3cd25f89f4f1d83760c60f7c0"
   integrity sha512-g50NrCdEcFlBfuwZb9RxLmxPNQ9wIaBPOiwbxlGYRkHMnsC6LNHcvVtyDnmndU8qoXrmCOZ6ocSZenOMlG+G1w==
@@ -740,12 +740,12 @@
     lodash "^4.17.21"
     semver "^7.3.8"
 
-"@oclif/test@^2.3.14":
-  version "2.3.15"
-  resolved "https://registry.yarnpkg.com/@oclif/test/-/test-2.3.15.tgz#03ab00ed80b7229352a9d359ae399b596f1a2eb7"
-  integrity sha512-MT8Q1Ioezj8klpEGh2oMT0Nvf8tI2f/nfwsHgkIVjzzJHCRikArITNkrP1051S32zKxFpiatTVgTmuquBQhXSg==
+"@oclif/test@^2.3.16":
+  version "2.3.16"
+  resolved "https://registry.yarnpkg.com/@oclif/test/-/test-2.3.16.tgz#f6a8898218dcc499e70338f715430788b6ee54c3"
+  integrity sha512-uL6pTh6700MAkmpXYaerADgcHuTWRhF3IFZhzY/fgSMw1E57BiUojYs+nCnLZRP+KeFsSC0gkqZWJkFYx71dIA==
   dependencies:
-    "@oclif/core" "^2.8.0"
+    "@oclif/core" "^2.8.2"
     fancy-test "^2.0.18"
 
 "@octokit/auth-token@^2.4.4":

From 2b324d3090c98969429b7d683eba4d48295e0dbb Mon Sep 17 00:00:00 2001
From: svc-cli-bot <svc_cli_bot@salesforce.com>
Date: Sun, 23 Apr 2023 06:54:00 +0000
Subject: [PATCH 17/23] chore: updates from devScripts

---
 package.json | 4 ++--
 yarn.lock    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index be15738c..ee1b3e3b 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
   "devDependencies": {
     "@oclif/test": "^2.3.16",
     "@salesforce/dev-config": "^3.1.0",
-    "@salesforce/dev-scripts": "^4.1.3",
+    "@salesforce/dev-scripts": "^4.3.0",
     "@salesforce/prettier-config": "^0.0.2",
     "@salesforce/ts-sinon": "^1.4.6",
     "@types/inquirer": "^8.2.3",
@@ -144,4 +144,4 @@
       "output": []
     }
   }
-}
\ No newline at end of file
+}
diff --git a/yarn.lock b/yarn.lock
index b19f285c..1469619c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -889,10 +889,10 @@
   resolved "https://registry.yarnpkg.com/@salesforce/dev-config/-/dev-config-3.1.0.tgz#8eb5b35860ff60d1c1dc3fd9329b01a28475d5b9"
   integrity sha512-cPph7ibj3DeSzWDFLcLtxOh5fmUlDUY2Ezq43n0V6auVP+l8orxRHjCExHS86SB3QKVgXkC8yYhryXiS8KF7Zw==
 
-"@salesforce/dev-scripts@^4.1.3":
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-4.1.3.tgz#e6d561e13f148d9ae6eec80d0e2e24303011e03c"
-  integrity sha512-RDZTM1Im2P++zRWSiLSGY31E+SYkHk+18uikMigZZm0XQsZf04XjDz0JMXujewMWWFnObJM0gKrswcDK/O9qSg==
+"@salesforce/dev-scripts@^4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-4.3.0.tgz#af20b6f09ccaee60533644c7e5d1f5c4453c950a"
+  integrity sha512-Ym1tBAyYxo+IuH/duojBvQHS7NXCysz61SzRG7forQCEEMq189h7zYshioLL+ZGPx3qNIQE04+Zx1Vbuf3qJAg==
   dependencies:
     "@commitlint/cli" "^17.1.2"
     "@commitlint/config-conventional" "^17.1.0"

From ac385c0bc16da5c50e53a8d39f582e592f5a1ed3 Mon Sep 17 00:00:00 2001
From: Mike Donnalley <mdonnalley@salesforce.com>
Date: Mon, 24 Apr 2023 10:03:18 -0600
Subject: [PATCH 18/23] fix: emit sfCommandError event (#240)

* fix: emit sfCommandError event

* fix: store parsed flags on class

* chore: remove uneccessary canges

---------

Co-authored-by: Cristian Dominguez <cdominguez@salesforce.com>
---
 src/sfCommand.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/sfCommand.ts b/src/sfCommand.ts
index 41dfc439..a4560bcc 100644
--- a/src/sfCommand.ts
+++ b/src/sfCommand.ts
@@ -483,6 +483,10 @@ export abstract class SfCommand<T> extends Command {
     // @ts-expect-error because skipOclifErrorHandling is not on SfError
     err.skipOclifErrorHandling = true;
 
+    // Emit an event for plugin-telemetry prerun hook to pick up.
+    // @ts-expect-error because TS is strict about the events that can be emitted on process.
+    process.emit('sfCommandError', err);
+
     throw err;
   }
 

From b32529f38b766167a93c200a04d3e108bfb791c8 Mon Sep 17 00:00:00 2001
From: svc-cli-bot <svc_cli_bot@salesforce.com>
Date: Mon, 24 Apr 2023 16:03:37 +0000
Subject: [PATCH 19/23] chore(release): 2.2.10 [skip ci]

---
 CHANGELOG.md | 9 +++++++++
 package.json | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0571d8b5..513a4a3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## [2.2.10](https://github.com/salesforcecli/sf-plugins-core/compare/2.2.9...2.2.10) (2023-04-24)
+
+
+### Bug Fixes
+
+* emit sfCommandError event ([#240](https://github.com/salesforcecli/sf-plugins-core/issues/240)) ([ac385c0](https://github.com/salesforcecli/sf-plugins-core/commit/ac385c0bc16da5c50e53a8d39f582e592f5a1ed3))
+
+
+
 ## [2.2.9](https://github.com/salesforcecli/sf-plugins-core/compare/2.2.8...2.2.9) (2023-04-19)
 
 
diff --git a/package.json b/package.json
index ee1b3e3b..1e0361a1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/sf-plugins-core",
-  "version": "2.2.9",
+  "version": "2.2.10",
   "description": "Utils for writing Salesforce CLI plugins",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -144,4 +144,4 @@
       "output": []
     }
   }
-}
+}
\ No newline at end of file

From b39ada36d2df142f18363951f38c84758ed9bb6e Mon Sep 17 00:00:00 2001
From: Steve Hetzel <shetzel@salesforce.com>
Date: Wed, 26 Apr 2023 17:03:15 -0600
Subject: [PATCH 20/23] fix: add more error properties to support push errors

---
 src/sfCommand.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/sfCommand.ts b/src/sfCommand.ts
index a4560bcc..d0a73f4c 100644
--- a/src/sfCommand.ts
+++ b/src/sfCommand.ts
@@ -445,6 +445,9 @@ export abstract class SfCommand<T> extends Command {
       code: codeFromError,
       // @ts-expect-error because context is not on Error
       context: (error.context as string) ?? null,
+      commandName: (error as SfCommand.Error).commandName ?? null,
+      // @ts-expect-error because result is not on Error
+      result: (error.result as unknown) ?? null,
     });
 
     // Create printable error object
@@ -557,6 +560,7 @@ export namespace SfCommand {
     exitCode?: number;
     data?: unknown;
     context?: string;
+    commandName?: string;
   }
 }
 

From 3903577266fe5168093d91ef9e264257b520e2e4 Mon Sep 17 00:00:00 2001
From: Steve Hetzel <shetzel@salesforce.com>
Date: Wed, 26 Apr 2023 21:49:43 -0600
Subject: [PATCH 21/23] chore: better assignment pattern

---
 src/sfCommand.ts | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/sfCommand.ts b/src/sfCommand.ts
index d0a73f4c..52090208 100644
--- a/src/sfCommand.ts
+++ b/src/sfCommand.ts
@@ -438,16 +438,12 @@ export abstract class SfCommand<T> extends Command {
     process.exitCode ??= codeFromError;
 
     const sfErrorProperties = removeEmpty({
-      // @ts-expect-error because data is not on Error
-      data: (error.data as unknown) ?? null,
-      // @ts-expect-error because actions is not on Error
-      actions: (error.actions as string[]) ?? null,
       code: codeFromError,
-      // @ts-expect-error because context is not on Error
-      context: (error.context as string) ?? null,
-      commandName: (error as SfCommand.Error).commandName ?? null,
-      // @ts-expect-error because result is not on Error
-      result: (error.result as unknown) ?? null,
+      actions: 'actions' in error ? error.actions : null,
+      context: 'context' in error ? error.context : null,
+      commandName: 'commandName' in error ? error.commandName : null,
+      data: 'data' in error ? error.data : null,
+      result: 'result' in error ? error.result : null,
     });
 
     // Create printable error object

From cf2a42f031f451b0766440fb3adac4dd82f6cae3 Mon Sep 17 00:00:00 2001
From: Steve Hetzel <shetzel@salesforce.com>
Date: Thu, 27 Apr 2023 14:28:32 -0600
Subject: [PATCH 22/23] chore: use command name for context

---
 src/sfCommand.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sfCommand.ts b/src/sfCommand.ts
index 52090208..3d9f01b7 100644
--- a/src/sfCommand.ts
+++ b/src/sfCommand.ts
@@ -440,8 +440,8 @@ export abstract class SfCommand<T> extends Command {
     const sfErrorProperties = removeEmpty({
       code: codeFromError,
       actions: 'actions' in error ? error.actions : null,
-      context: 'context' in error ? error.context : null,
-      commandName: 'commandName' in error ? error.commandName : null,
+      context: 'context' in error ? error.context : this.statics.name,
+      commandName: 'commandName' in error ? error.commandName : this.statics.name,
       data: 'data' in error ? error.data : null,
       result: 'result' in error ? error.result : null,
     });

From d8bc2370e0ef6446be1387d9671b6ea4b25cb1d3 Mon Sep 17 00:00:00 2001
From: svc-cli-bot <svc_cli_bot@salesforce.com>
Date: Thu, 27 Apr 2023 21:23:06 +0000
Subject: [PATCH 23/23] chore(release): 2.2.11 [skip ci]

---
 CHANGELOG.md | 9 +++++++++
 package.json | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 513a4a3f..4deb4e5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## [2.2.11](https://github.com/salesforcecli/sf-plugins-core/compare/2.2.10...2.2.11) (2023-04-27)
+
+
+### Bug Fixes
+
+* add more error properties to support push errors ([b39ada3](https://github.com/salesforcecli/sf-plugins-core/commit/b39ada36d2df142f18363951f38c84758ed9bb6e))
+
+
+
 ## [2.2.10](https://github.com/salesforcecli/sf-plugins-core/compare/2.2.9...2.2.10) (2023-04-24)
 
 
diff --git a/package.json b/package.json
index 1e0361a1..c3317ffa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/sf-plugins-core",
-  "version": "2.2.10",
+  "version": "2.2.11",
   "description": "Utils for writing Salesforce CLI plugins",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",