From f07ffe079f883b1583d10cd8bf640f0e15c3f197 Mon Sep 17 00:00:00 2001
From: Mike Donnalley <mdonnalley@salesforce.com>
Date: Thu, 7 Sep 2023 10:53:29 -0600
Subject: [PATCH 01/16] feat: add version diff prerun hook

---
 package.json        |  3 ++-
 src/hooks/prerun.ts | 31 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 src/hooks/prerun.ts

diff --git a/package.json b/package.json
index e0275ade..124811d1 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,8 @@
     "hooks": {
       "command_incomplete": "./dist/hooks/incomplete",
       "plugins:preinstall": "./dist/hooks/pluginsPreinstall.js",
-      "update": "./dist/hooks/display-release-notes.js"
+      "update": "./dist/hooks/display-release-notes.js",
+      "prerun": "./dist/hooks/prerun"
     },
     "update": {
       "s3": {
diff --git a/src/hooks/prerun.ts b/src/hooks/prerun.ts
new file mode 100644
index 00000000..cfcfe1aa
--- /dev/null
+++ b/src/hooks/prerun.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2023, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+
+import { Hook, ux } from '@oclif/core';
+
+// eslint-disable-next-line @typescript-eslint/require-await
+const hook: Hook.Prerun = async function ({ config }) {
+  const jitPlugins = config.pjson.oclif.jitPlugins ?? {};
+  const deps = config.pjson.dependencies ?? {};
+  for (const plugin of config.getPluginsList()) {
+    // Skip the root plugin
+    if (plugin.root === config.root) continue;
+    // Skip user plugins that are not in the jitPlugins configuration
+    if (plugin.type === 'user' && !jitPlugins[plugin.name]) continue;
+    // Skip linked plugins
+    if (plugin.type === 'link') continue;
+
+    const specifiedVersion = jitPlugins[plugin.name] ?? deps[plugin.name];
+    if (plugin.version !== specifiedVersion) {
+      ux.warn(
+        `Plugin ${plugin.name} (${plugin.version}) differs from the version specified by ${config.bin} (${specifiedVersion})`
+      );
+    }
+  }
+};
+
+export default hook;

From f9bc07537e27cc46f6e1ae9a7a8d21c4104ea82e Mon Sep 17 00:00:00 2001
From: Mike Donnalley <mdonnalley@salesforce.com>
Date: Thu, 7 Sep 2023 11:04:23 -0600
Subject: [PATCH 02/16] fix: show warning only for plugin to which the command
 belongs

---
 src/hooks/prerun.ts | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/hooks/prerun.ts b/src/hooks/prerun.ts
index cfcfe1aa..92edd787 100644
--- a/src/hooks/prerun.ts
+++ b/src/hooks/prerun.ts
@@ -8,23 +8,21 @@
 import { Hook, ux } from '@oclif/core';
 
 // eslint-disable-next-line @typescript-eslint/require-await
-const hook: Hook.Prerun = async function ({ config }) {
+const hook: Hook.Prerun = async function ({ Command, config }) {
+  const { plugin } = Command;
+  if (!plugin) return;
+  if (plugin.type === 'link') return;
+
   const jitPlugins = config.pjson.oclif.jitPlugins ?? {};
   const deps = config.pjson.dependencies ?? {};
-  for (const plugin of config.getPluginsList()) {
-    // Skip the root plugin
-    if (plugin.root === config.root) continue;
-    // Skip user plugins that are not in the jitPlugins configuration
-    if (plugin.type === 'user' && !jitPlugins[plugin.name]) continue;
-    // Skip linked plugins
-    if (plugin.type === 'link') continue;
 
-    const specifiedVersion = jitPlugins[plugin.name] ?? deps[plugin.name];
-    if (plugin.version !== specifiedVersion) {
-      ux.warn(
-        `Plugin ${plugin.name} (${plugin.version}) differs from the version specified by ${config.bin} (${specifiedVersion})`
-      );
-    }
+  const specifiedVersion = jitPlugins[plugin.name] ?? deps[plugin.name];
+  if (!specifiedVersion) return;
+
+  if (plugin.version !== specifiedVersion) {
+    ux.warn(
+      `Plugin ${plugin.name} (${plugin.version}) differs from the version specified by ${config.bin} (${specifiedVersion})`
+    );
   }
 };
 

From de7de5eab8ed4fe6f03aa61a587baab8f0de24fc Mon Sep 17 00:00:00 2001
From: Mike Donnalley <mdonnalley@salesforce.com>
Date: Fri, 8 Sep 2023 15:38:37 -0600
Subject: [PATCH 03/16] fix: skip if --json flag present

---
 src/hooks/prerun.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hooks/prerun.ts b/src/hooks/prerun.ts
index 92edd787..a6c994cc 100644
--- a/src/hooks/prerun.ts
+++ b/src/hooks/prerun.ts
@@ -9,6 +9,7 @@ import { Hook, ux } from '@oclif/core';
 
 // eslint-disable-next-line @typescript-eslint/require-await
 const hook: Hook.Prerun = async function ({ Command, config }) {
+  if (process.argv.includes('--json')) return;
   const { plugin } = Command;
   if (!plugin) return;
   if (plugin.type === 'link') return;

From 0d4f37517419091a90f01986017780ec1a0fa629 Mon Sep 17 00:00:00 2001
From: svc-cli-bot <svc_cli_bot@salesforce.com>
Date: Sat, 9 Sep 2023 02:07:41 +0000
Subject: [PATCH 04/16] chore(release): bump to 2.9.2

---
 package.json | 10 +++++-----
 yarn.lock    | 36 ++++++++++++++++++------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index fd66adb4..d951bc4c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/cli",
   "description": "The Salesforce CLI",
-  "version": "2.9.1",
+  "version": "2.9.2",
   "author": "Salesforce",
   "bin": {
     "sf": "./bin/run",
@@ -126,7 +126,7 @@
     "@oclif/plugin-commands": "2.2.25",
     "@oclif/plugin-help": "5.2.19",
     "@oclif/plugin-not-found": "2.4.1",
-    "@oclif/plugin-plugins": "3.4.2",
+    "@oclif/plugin-plugins": "3.5.0",
     "@oclif/plugin-search": "0.0.22",
     "@oclif/plugin-update": "3.2.3",
     "@oclif/plugin-version": "1.3.10",
@@ -136,11 +136,11 @@
     "@salesforce/plugin-apex": "2.3.14",
     "@salesforce/plugin-auth": "2.8.16",
     "@salesforce/plugin-data": "2.5.8",
-    "@salesforce/plugin-deploy-retrieve": "1.17.8",
+    "@salesforce/plugin-deploy-retrieve": "1.17.9",
     "@salesforce/plugin-info": "2.6.40",
     "@salesforce/plugin-limits": "2.3.33",
     "@salesforce/plugin-login": "1.2.29",
-    "@salesforce/plugin-marketplace": "0.1.3",
+    "@salesforce/plugin-marketplace": "0.2.0",
     "@salesforce/plugin-org": "2.10.6",
     "@salesforce/plugin-schema": "2.3.25",
     "@salesforce/plugin-settings": "1.4.28",
@@ -188,7 +188,7 @@
   "resolutions": {
     "@salesforce/schemas": "1.6.0",
     "@salesforce/templates": "59.0.1",
-    "@salesforce/source-deploy-retrieve": "9.7.9",
+    "@salesforce/source-deploy-retrieve": "9.7.10",
     "@salesforce/source-tracking": "4.2.12"
   },
   "repository": "salesforcecli/cli",
diff --git a/yarn.lock b/yarn.lock
index 8adf7446..d7b7ec58 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1228,10 +1228,10 @@
     chalk "^4"
     fast-levenshtein "^3.0.0"
 
-"@oclif/plugin-plugins@3.4.2":
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/@oclif/plugin-plugins/-/plugin-plugins-3.4.2.tgz#63888867b9a29f66a38560e175cea3709fc934d4"
-  integrity sha512-0goaZY8XOk6gH/c5nZ4k3DYnNdY0ZHCqe2bvSaT7rH2UCgeo/sS70gGYqbnn+TVIVxN6mIL9ogzsLtpQy02U3A==
+"@oclif/plugin-plugins@3.5.0":
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/@oclif/plugin-plugins/-/plugin-plugins-3.5.0.tgz#48f4ec8d17bd3c76e87da581e40ef8f05b03817d"
+  integrity sha512-eE1P5jaFLLAeJvs2ilnGIHbxlhr7Z+3qgn/2uQoAGyozbSltAVkRRQ0LGPrGsqiwdgpgSpR2fPcvaskFanKfyA==
   dependencies:
     "@oclif/core" "^2.11.10"
     chalk "^4.1.2"
@@ -1714,16 +1714,16 @@
     jsforce "^2.0.0-beta.27"
     tslib "^2"
 
-"@salesforce/plugin-deploy-retrieve@1.17.8":
-  version "1.17.8"
-  resolved "https://registry.yarnpkg.com/@salesforce/plugin-deploy-retrieve/-/plugin-deploy-retrieve-1.17.8.tgz#e3d1b3e766ca70d6f856ed7089e93af14da658dd"
-  integrity sha512-7EILp+1Xj27Ha3J1IEIOqdP9T0E+fwH07wSxQhifZN6pnUMth0G3V5/DnKUfJLYcZY3a4mTgPXxdNMYGVJZZCQ==
+"@salesforce/plugin-deploy-retrieve@1.17.9":
+  version "1.17.9"
+  resolved "https://registry.yarnpkg.com/@salesforce/plugin-deploy-retrieve/-/plugin-deploy-retrieve-1.17.9.tgz#3e7dedeec617868bf32440ba2bf6a301972a977f"
+  integrity sha512-vpeP0HPh7uQQoQj9sqcsEUt8Qj8azZ1k4ZEVm5BGEe+0mm2SKHOIMicuYFliEgSygiipdrgSBNWZovqbwcTy7A==
   dependencies:
-    "@oclif/core" "^2.11.7"
+    "@oclif/core" "^2.15.0"
     "@salesforce/apex-node" "^2.1.0"
     "@salesforce/core" "^5.2.5"
     "@salesforce/kit" "^3.0.9"
-    "@salesforce/sf-plugins-core" "^3.1.14"
+    "@salesforce/sf-plugins-core" "^3.1.20"
     "@salesforce/source-deploy-retrieve" "^9.7.2"
     "@salesforce/source-tracking" "^4.2.10"
     chalk "^4.1.2"
@@ -1771,10 +1771,10 @@
     inquirer "^8.2.6"
     tslib "^2"
 
-"@salesforce/plugin-marketplace@0.1.3":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@salesforce/plugin-marketplace/-/plugin-marketplace-0.1.3.tgz#7bd99ca5d56cf04cb6aba6deb55bd5bc61f1b9c8"
-  integrity sha512-z196F42jObSln7aN2mAuPZ7ecrdBhR/ie0Fo6UTy3Vtck/Nx37jJtW/mx2QWhFIfSGbcAOEpo45Q30wYv8MwHg==
+"@salesforce/plugin-marketplace@0.2.0":
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/@salesforce/plugin-marketplace/-/plugin-marketplace-0.2.0.tgz#ac5493bc1af02d6fba1fd4e0a15c92c9b4207f5a"
+  integrity sha512-CpkqkBWs0c5ltpPHNyIS/mwb41c4fHhmkxzcNppacTevKgu0KCzya24BCsK1xGVR0fHIMU+TySZBRGpTySDTrw==
   dependencies:
     "@oclif/core" "^2.15.0"
     "@salesforce/core" "^5.2.0"
@@ -1958,10 +1958,10 @@
     chalk "^4"
     inquirer "^8.2.5"
 
-"@salesforce/source-deploy-retrieve@9.7.9", "@salesforce/source-deploy-retrieve@^9.7.2", "@salesforce/source-deploy-retrieve@^9.7.4", "@salesforce/source-deploy-retrieve@^9.7.8":
-  version "9.7.9"
-  resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-9.7.9.tgz#ec24124950ec1365ad48b38bc0b8898b9eceb524"
-  integrity sha512-lp166IZX3Me8I2YUIZS4uAgKLnbGp1MdbAUlpUL5VhAQBh7dNuPcjDFSueTEVG/4vfGPkM4s+65WMi2sJfx8pg==
+"@salesforce/source-deploy-retrieve@9.7.10", "@salesforce/source-deploy-retrieve@^9.7.2", "@salesforce/source-deploy-retrieve@^9.7.4", "@salesforce/source-deploy-retrieve@^9.7.8":
+  version "9.7.10"
+  resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-9.7.10.tgz#ce500519acebcab92edf947230dafbd883b53624"
+  integrity sha512-QbMrFq0V3YpHuI0Ad5kmltfs/ocMfms/NUpHr+pWZ5dbeXg7BcQWo3MgrfonzG5AWfSQ9YQs4AjJdQB0CeK+lw==
   dependencies:
     "@salesforce/core" "^5.2.1"
     "@salesforce/kit" "^3.0.11"

From a5dc1232450ed641e6198d01f3901454e4ee6aa7 Mon Sep 17 00:00:00 2001
From: svc-cli-bot <svc_cli_bot@salesforce.com>
Date: Sun, 10 Sep 2023 02:10:58 +0000
Subject: [PATCH 05/16] chore(release): bump to 2.9.3

---
 package.json |  12 ++---
 yarn.lock    | 122 +++++++++++++++++++++++++--------------------------
 2 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/package.json b/package.json
index d951bc4c..11e392f2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/cli",
   "description": "The Salesforce CLI",
-  "version": "2.9.2",
+  "version": "2.9.3",
   "author": "Salesforce",
   "bin": {
     "sf": "./bin/run",
@@ -71,9 +71,9 @@
     ],
     "jitPlugins": {
       "@salesforce/plugin-custom-metadata": "2.2.1",
-      "@salesforce/plugin-community": "2.4.0",
+      "@salesforce/plugin-community": "2.4.1",
       "@salesforce/plugin-dev": "1.1.10",
-      "@salesforce/plugin-devops-center": "1.1.4",
+      "@salesforce/plugin-devops-center": "1.1.5",
       "@salesforce/plugin-env": "2.1.25",
       "@salesforce/plugin-functions": "1.21.12",
       "@salesforce/plugin-packaging": "1.24.0",
@@ -136,7 +136,7 @@
     "@salesforce/plugin-apex": "2.3.14",
     "@salesforce/plugin-auth": "2.8.16",
     "@salesforce/plugin-data": "2.5.8",
-    "@salesforce/plugin-deploy-retrieve": "1.17.9",
+    "@salesforce/plugin-deploy-retrieve": "1.17.12",
     "@salesforce/plugin-info": "2.6.40",
     "@salesforce/plugin-limits": "2.3.33",
     "@salesforce/plugin-login": "1.2.29",
@@ -146,9 +146,9 @@
     "@salesforce/plugin-settings": "1.4.28",
     "@salesforce/plugin-sobject": "0.2.6",
     "@salesforce/plugin-source": "2.10.33",
-    "@salesforce/plugin-telemetry": "2.3.1",
+    "@salesforce/plugin-telemetry": "2.3.2",
     "@salesforce/plugin-templates": "55.5.11",
-    "@salesforce/plugin-trust": "2.6.9",
+    "@salesforce/plugin-trust": "2.6.10",
     "@salesforce/plugin-user": "2.3.32",
     "@salesforce/sf-plugins-core": "3.1.22",
     "debug": "^4.3.4",
diff --git a/yarn.lock b/yarn.lock
index d7b7ec58..62d7c7cb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1576,10 +1576,10 @@
     strip-ansi "6.0.1"
     ts-retry-promise "^0.7.0"
 
-"@salesforce/core@^5.2.0", "@salesforce/core@^5.2.1", "@salesforce/core@^5.2.5", "@salesforce/core@^5.2.6":
-  version "5.2.6"
-  resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-5.2.6.tgz#e3a563410f46c116fad0b6c999ea47fb7ec96a9c"
-  integrity sha512-DIUg+RfdnJggbw0YU2mI7JZ7RjqAcWmr/TCUp4VQ9bWQ4T/xAkwnYd3TMle8fPBYVJxGbyvQo22SGcXLBCf7xA==
+"@salesforce/core@^5.2.0", "@salesforce/core@^5.2.1", "@salesforce/core@^5.2.5", "@salesforce/core@^5.2.6", "@salesforce/core@^5.2.7":
+  version "5.2.7"
+  resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-5.2.7.tgz#aa9c3a92e14abe12695e06f326e072d49e2b958c"
+  integrity sha512-3tRWuPCSx4oTyD00fJUuxhulPMtaEF0BVvNvYcm38Axj/0WeLGOw7CFvoTupmmcCALHJFnxB1Kl20jDvrbB/7w==
   dependencies:
     "@salesforce/kit" "^3.0.11"
     "@salesforce/schemas" "^1.6.0"
@@ -1598,7 +1598,7 @@
     pino-pretty "^10.2.0"
     proper-lockfile "^4.1.2"
     semver "^7.5.4"
-    ts-retry-promise "^0.7.0"
+    ts-retry-promise "^0.7.1"
 
 "@salesforce/dev-config@^3.0.0":
   version "3.1.0"
@@ -1714,18 +1714,18 @@
     jsforce "^2.0.0-beta.27"
     tslib "^2"
 
-"@salesforce/plugin-deploy-retrieve@1.17.9":
-  version "1.17.9"
-  resolved "https://registry.yarnpkg.com/@salesforce/plugin-deploy-retrieve/-/plugin-deploy-retrieve-1.17.9.tgz#3e7dedeec617868bf32440ba2bf6a301972a977f"
-  integrity sha512-vpeP0HPh7uQQoQj9sqcsEUt8Qj8azZ1k4ZEVm5BGEe+0mm2SKHOIMicuYFliEgSygiipdrgSBNWZovqbwcTy7A==
+"@salesforce/plugin-deploy-retrieve@1.17.12":
+  version "1.17.12"
+  resolved "https://registry.yarnpkg.com/@salesforce/plugin-deploy-retrieve/-/plugin-deploy-retrieve-1.17.12.tgz#3ecb538a0b27804575fab1f8894a19b742f7939f"
+  integrity sha512-R8LqVumWv9uK9xCZiVyctCf8KgjADL/HWyvVImQY6HsgqAaBpXIP40xAqeHXp8sd+rHZrDwB2NoqtuubRgkQyw==
   dependencies:
     "@oclif/core" "^2.15.0"
     "@salesforce/apex-node" "^2.1.0"
-    "@salesforce/core" "^5.2.5"
+    "@salesforce/core" "^5.2.7"
     "@salesforce/kit" "^3.0.9"
     "@salesforce/sf-plugins-core" "^3.1.20"
-    "@salesforce/source-deploy-retrieve" "^9.7.2"
-    "@salesforce/source-tracking" "^4.2.10"
+    "@salesforce/source-deploy-retrieve" "^9.7.10"
+    "@salesforce/source-tracking" "^4.2.12"
     chalk "^4.1.2"
     shelljs "^0.8.5"
     tslib "^2"
@@ -1879,15 +1879,15 @@
     proxy-agent "^6.3.0"
     tslib "^2"
 
-"@salesforce/plugin-telemetry@2.3.1":
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/@salesforce/plugin-telemetry/-/plugin-telemetry-2.3.1.tgz#8202496c717f156eb4e77d3a7b5e8a98ff9d3b23"
-  integrity sha512-AZg5OYanEF3ATqO7dsvpXNY7+fRLGF2cSKKcLJtioI95XBpKmO1RqmRs4cafGi4bN6+MVCmBgUwcIyzbIv2Ohw==
+"@salesforce/plugin-telemetry@2.3.2":
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/@salesforce/plugin-telemetry/-/plugin-telemetry-2.3.2.tgz#ba6d6b9600a7390663c03c33b62cf35d49dd64da"
+  integrity sha512-C6lDdnDtFldS+P/lyErjtc/NAJxaZGg0CXqlsKRZEy+TOt+Na2qOlvrxzIn4OVm0bkREExtlQMebVmGJoNOEFg==
   dependencies:
-    "@oclif/core" "^2.11.7"
+    "@oclif/core" "^2.15.0"
     "@salesforce/core" "^5.2.0"
-    "@salesforce/sf-plugins-core" "^3.1.14"
-    "@salesforce/telemetry" "^4.1.2"
+    "@salesforce/sf-plugins-core" "^3.1.20"
+    "@salesforce/telemetry" "^4.1.3"
     debug "^4.3.4"
     tslib "^2"
 
@@ -1904,14 +1904,14 @@
     yeoman-environment "^3.19.3"
     yeoman-generator "^5.9.0"
 
-"@salesforce/plugin-trust@2.6.9", "@salesforce/plugin-trust@^2.4.2":
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/@salesforce/plugin-trust/-/plugin-trust-2.6.9.tgz#8bcdd3e87c414ffd80da3a5ec0aadd4f9db5642d"
-  integrity sha512-kVQixGAZUxkBKSvbdsEB3rjo2X8k2G9EjzLTaL53NWL2vNxwjZvmzPkw2rmZm1Wr5ed1TA1lEIm1jwLvh2kPPg==
+"@salesforce/plugin-trust@2.6.10", "@salesforce/plugin-trust@^2.4.2":
+  version "2.6.10"
+  resolved "https://registry.yarnpkg.com/@salesforce/plugin-trust/-/plugin-trust-2.6.10.tgz#4b52fc2d994ca84c4d9dfe5bd50adff871cd7b84"
+  integrity sha512-aLVIRJyo280sEvyOGvCpAWtsT0YVIbKlOO6Muan2BbwRMmjy6rpFK8/SRgLNz/Mf69qNosQoyozjW9gSZsaByg==
   dependencies:
-    "@oclif/core" "^2.11.10"
+    "@oclif/core" "^2.15.0"
     "@salesforce/core" "^5.2.1"
-    "@salesforce/sf-plugins-core" "^3.1.20"
+    "@salesforce/sf-plugins-core" "^3.1.22"
     got "^11"
     npm "9.6.7"
     npm-run-path "^4.0.1"
@@ -1946,7 +1946,7 @@
   resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.6.0.tgz#14505ebad2fb2d4f7b14837545d662766d293561"
   integrity sha512-SwhDTLucj/GRbPpxlEoDZeqlX22o+G6fiebTXTu1cZKmd1oE0W2L7SlTTgJnWck8bhTeBIgQi9cpD8c2t5ISKA==
 
-"@salesforce/sf-plugins-core@3.1.22", "@salesforce/sf-plugins-core@^3.1.14", "@salesforce/sf-plugins-core@^3.1.15", "@salesforce/sf-plugins-core@^3.1.16", "@salesforce/sf-plugins-core@^3.1.18", "@salesforce/sf-plugins-core@^3.1.20":
+"@salesforce/sf-plugins-core@3.1.22", "@salesforce/sf-plugins-core@^3.1.14", "@salesforce/sf-plugins-core@^3.1.15", "@salesforce/sf-plugins-core@^3.1.16", "@salesforce/sf-plugins-core@^3.1.18", "@salesforce/sf-plugins-core@^3.1.20", "@salesforce/sf-plugins-core@^3.1.22":
   version "3.1.22"
   resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-3.1.22.tgz#caade6439366fe9a28c819bd3b8fef0cbb2a712a"
   integrity sha512-t8IvC+8LLzCU+skT3/FGjpkB6qm+VaL3uCbwrqgmZivzQc5tpRQpVcW9YbTgJUgkQrD58yurbkwX/jA9hMR6yg==
@@ -1958,7 +1958,7 @@
     chalk "^4"
     inquirer "^8.2.5"
 
-"@salesforce/source-deploy-retrieve@9.7.10", "@salesforce/source-deploy-retrieve@^9.7.2", "@salesforce/source-deploy-retrieve@^9.7.4", "@salesforce/source-deploy-retrieve@^9.7.8":
+"@salesforce/source-deploy-retrieve@9.7.10", "@salesforce/source-deploy-retrieve@^9.7.10", "@salesforce/source-deploy-retrieve@^9.7.4", "@salesforce/source-deploy-retrieve@^9.7.8":
   version "9.7.10"
   resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-9.7.10.tgz#ce500519acebcab92edf947230dafbd883b53624"
   integrity sha512-QbMrFq0V3YpHuI0Ad5kmltfs/ocMfms/NUpHr+pWZ5dbeXg7BcQWo3MgrfonzG5AWfSQ9YQs4AjJdQB0CeK+lw==
@@ -1977,7 +1977,7 @@
     proxy-agent "^6.3.0"
     unzipper "0.10.14"
 
-"@salesforce/source-tracking@4.2.12", "@salesforce/source-tracking@^4.2.10":
+"@salesforce/source-tracking@4.2.12", "@salesforce/source-tracking@^4.2.10", "@salesforce/source-tracking@^4.2.12":
   version "4.2.12"
   resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-4.2.12.tgz#91250ac48f70985c8529d601fd9237d7b5193269"
   integrity sha512-hxN4rMmyOmZoUJTy5fyg33ovhKc0ffCqX6j0EqAX90gHO4OQqNMWvweogbzX7h8nkFyNv+ZLyDeJBAdMnTgnWw==
@@ -1991,16 +1991,16 @@
     isomorphic-git "1.23.0"
     ts-retry-promise "^0.7.0"
 
-"@salesforce/telemetry@^4.1.2":
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/@salesforce/telemetry/-/telemetry-4.1.2.tgz#40185f9ebf9184bcd11dad4f8999598d65674697"
-  integrity sha512-8DYVjem2EUfePJSVT/dxbLaOn0SmFFgeaY/OA3JiMUebsVQVUON1MvqHpcErYrmTJ30o3MOWLoTZ3RsbFt1SUQ==
+"@salesforce/telemetry@^4.1.3":
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/@salesforce/telemetry/-/telemetry-4.1.5.tgz#460d5af55d384b859cab5953a14de0f317830372"
+  integrity sha512-Xu8tuXYyA7stnc6RNyona4dPaxgKkgVmWsllFzeloaKi89buCIsVmUTnt3sv3ERAHRno83bARMUEeh9tEaZLKw==
   dependencies:
-    "@salesforce/core" "^5.2.1"
+    "@salesforce/core" "^5.2.7"
     "@salesforce/ts-types" "^2.0.6"
     applicationinsights "^2.7.3"
     got "^11"
-    proxy-agent "^6.3.0"
+    proxy-agent "^6.3.1"
 
 "@salesforce/templates@59.0.1", "@salesforce/templates@^59.0.1":
   version "59.0.1"
@@ -2577,7 +2577,7 @@ agent-base@6, agent-base@^6.0.2:
   dependencies:
     debug "4"
 
-agent-base@^7.0.1, agent-base@^7.0.2, agent-base@^7.1.0:
+agent-base@^7.0.2, agent-base@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.0.tgz#536802b76bc0b34aa50195eb2442276d613e3434"
   integrity sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==
@@ -5890,10 +5890,10 @@ https-proxy-agent@^5.0.0:
     agent-base "6"
     debug "4"
 
-https-proxy-agent@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.0.tgz#75cb70d04811685667183b31ab158d006750418a"
-  integrity sha512-0euwPCRyAPSgGdzD1IVN9nJYHtBhJwb6XPfbpQcYbPCwrBidX6GzxmchnaF4sfF/jPb74Ojx5g4yTg3sixlyPw==
+https-proxy-agent@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz#e2645b846b90e96c6e6f347fb5b2e41f1590b09b"
+  integrity sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==
   dependencies:
     agent-base "^7.0.2"
     debug "4"
@@ -8409,19 +8409,19 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-pac-proxy-agent@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-7.0.0.tgz#db42120c64292685dafaf2bd921e223c56bfb13b"
-  integrity sha512-t4tRAMx0uphnZrio0S0Jw9zg3oDbz1zVhQ/Vy18FjLfP1XOLNUEjaVxYCYRI6NS+BsMBXKIzV6cTLOkO9AtywA==
+pac-proxy-agent@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-7.0.1.tgz#6b9ddc002ec3ff0ba5fdf4a8a21d363bcc612d75"
+  integrity sha512-ASV8yU4LLKBAjqIPMbrgtaKIvxQri/yh2OpI+S6hVa9JRkUI3Y3NPFbfngDtY7oFtSMD3w31Xns89mDa3Feo5A==
   dependencies:
     "@tootallnate/quickjs-emscripten" "^0.23.0"
     agent-base "^7.0.2"
     debug "^4.3.4"
     get-uri "^6.0.1"
     http-proxy-agent "^7.0.0"
-    https-proxy-agent "^7.0.0"
+    https-proxy-agent "^7.0.2"
     pac-resolver "^7.0.0"
-    socks-proxy-agent "^8.0.1"
+    socks-proxy-agent "^8.0.2"
 
 pac-resolver@^7.0.0:
   version "7.0.0"
@@ -8841,19 +8841,19 @@ proper-lockfile@^4.1.2:
     retry "^0.12.0"
     signal-exit "^3.0.2"
 
-proxy-agent@^6.2.1, proxy-agent@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-6.3.0.tgz#72f7bb20eb06049db79f7f86c49342c34f9ba08d"
-  integrity sha512-0LdR757eTj/JfuU7TL2YCuAZnxWXu3tkJbg4Oq3geW/qFNT/32T0sp2HnZ9O0lMR4q3vwAt0+xCA8SR0WAD0og==
+proxy-agent@^6.2.1, proxy-agent@^6.3.0, proxy-agent@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-6.3.1.tgz#40e7b230552cf44fd23ffaf7c59024b692612687"
+  integrity sha512-Rb5RVBy1iyqOtNl15Cw/llpeLH8bsb37gM1FUfKQ+Wck6xHlbAhWGUFiTRHtkjqGTA5pSHz6+0hrPW/oECihPQ==
   dependencies:
     agent-base "^7.0.2"
     debug "^4.3.4"
     http-proxy-agent "^7.0.0"
-    https-proxy-agent "^7.0.0"
+    https-proxy-agent "^7.0.2"
     lru-cache "^7.14.1"
-    pac-proxy-agent "^7.0.0"
+    pac-proxy-agent "^7.0.1"
     proxy-from-env "^1.1.0"
-    socks-proxy-agent "^8.0.1"
+    socks-proxy-agent "^8.0.2"
 
 proxy-from-env@^1.1.0:
   version "1.1.0"
@@ -9613,12 +9613,12 @@ socks-proxy-agent@^7.0.0:
     debug "^4.3.3"
     socks "^2.6.2"
 
-socks-proxy-agent@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.1.tgz#ffc5859a66dac89b0c4dab90253b96705f3e7120"
-  integrity sha512-59EjPbbgg8U3x62hhKOFVAmySQUcfRQ4C7Q/D5sEHnZTQRrQlNKINks44DMR1gwXp0p4LaVIeccX2KHTTcHVqQ==
+socks-proxy-agent@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz#5acbd7be7baf18c46a3f293a840109a430a640ad"
+  integrity sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==
   dependencies:
-    agent-base "^7.0.1"
+    agent-base "^7.0.2"
     debug "^4.3.4"
     socks "^2.7.1"
 
@@ -10139,10 +10139,10 @@ ts-node@^10.0.0, ts-node@^10.8.1, ts-node@^10.9.1:
     v8-compile-cache-lib "^3.0.1"
     yn "3.1.1"
 
-ts-retry-promise@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/ts-retry-promise/-/ts-retry-promise-0.7.0.tgz#08f2dcbbf5d2981495841cb63389a268324e8147"
-  integrity sha512-x6yWZXC4BfXy4UyMweOFvbS1yJ/Y5biSz/mEPiILtJZLrqD3ZxIpzVOGGgifHHdaSe3WxzFRtsRbychI6zofOg==
+ts-retry-promise@^0.7.0, ts-retry-promise@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/ts-retry-promise/-/ts-retry-promise-0.7.1.tgz#176d6eee6415f07b6c7c286d3657355e284a6906"
+  integrity sha512-NhHOCZ2AQORvH42hOPO5UZxShlcuiRtm7P2jIq2L2RY3PBxw2mLnUsEdHrIslVBFya1v5aZmrR55lWkzo13LrQ==
 
 tsconfig-paths@^3.14.1, tsconfig-paths@^3.14.2:
   version "3.14.2"

From 5d869d4e0124fe1748b62304748e9371050500cf Mon Sep 17 00:00:00 2001
From: svc-cli-bot <svc_cli_bot@salesforce.com>
Date: Sun, 10 Sep 2023 18:09:29 +0000
Subject: [PATCH 06/16] chore(release): bump to 2.9.4

---
 package.json |  22 ++++++------
 yarn.lock    | 100 +++++++++++++++++++++++++--------------------------
 2 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/package.json b/package.json
index 11e392f2..295a4052 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/cli",
   "description": "The Salesforce CLI",
-  "version": "2.9.3",
+  "version": "2.9.4",
   "author": "Salesforce",
   "bin": {
     "sf": "./bin/run",
@@ -70,11 +70,11 @@
       "@salesforce/plugin-user"
     ],
     "jitPlugins": {
-      "@salesforce/plugin-custom-metadata": "2.2.1",
+      "@salesforce/plugin-custom-metadata": "2.2.2",
       "@salesforce/plugin-community": "2.4.1",
       "@salesforce/plugin-dev": "1.1.10",
       "@salesforce/plugin-devops-center": "1.1.5",
-      "@salesforce/plugin-env": "2.1.25",
+      "@salesforce/plugin-env": "2.1.26",
       "@salesforce/plugin-functions": "1.21.12",
       "@salesforce/plugin-packaging": "1.24.0",
       "@salesforce/plugin-signups": "1.4.34",
@@ -135,16 +135,16 @@
     "@salesforce/core": "^5.2.0",
     "@salesforce/plugin-apex": "2.3.14",
     "@salesforce/plugin-auth": "2.8.16",
-    "@salesforce/plugin-data": "2.5.8",
+    "@salesforce/plugin-data": "2.5.9",
     "@salesforce/plugin-deploy-retrieve": "1.17.12",
-    "@salesforce/plugin-info": "2.6.40",
-    "@salesforce/plugin-limits": "2.3.33",
-    "@salesforce/plugin-login": "1.2.29",
-    "@salesforce/plugin-marketplace": "0.2.0",
-    "@salesforce/plugin-org": "2.10.6",
+    "@salesforce/plugin-info": "2.6.42",
+    "@salesforce/plugin-limits": "2.3.34",
+    "@salesforce/plugin-login": "1.2.30",
+    "@salesforce/plugin-marketplace": "0.2.1",
+    "@salesforce/plugin-org": "2.10.7",
     "@salesforce/plugin-schema": "2.3.25",
     "@salesforce/plugin-settings": "1.4.28",
-    "@salesforce/plugin-sobject": "0.2.6",
+    "@salesforce/plugin-sobject": "0.2.7",
     "@salesforce/plugin-source": "2.10.33",
     "@salesforce/plugin-telemetry": "2.3.2",
     "@salesforce/plugin-templates": "55.5.11",
@@ -188,7 +188,7 @@
   "resolutions": {
     "@salesforce/schemas": "1.6.0",
     "@salesforce/templates": "59.0.1",
-    "@salesforce/source-deploy-retrieve": "9.7.10",
+    "@salesforce/source-deploy-retrieve": "9.7.13",
     "@salesforce/source-tracking": "4.2.12"
   },
   "repository": "salesforcecli/cli",
diff --git a/yarn.lock b/yarn.lock
index 62d7c7cb..822b0b06 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1698,15 +1698,15 @@
     handlebars "^4.7.8"
     tslib "^2"
 
-"@salesforce/plugin-data@2.5.8":
-  version "2.5.8"
-  resolved "https://registry.yarnpkg.com/@salesforce/plugin-data/-/plugin-data-2.5.8.tgz#803e27d73246c17d385d31d22c821958e7a23e29"
-  integrity sha512-mammodmsNHeZRcy5QvKZbPNARo+s1vV4nTjNmXa2QU0An5YhhEQEH1/2Au+Ml6eWLmUm7z2Wb6Qh5M0Jw1cFkA==
+"@salesforce/plugin-data@2.5.9":
+  version "2.5.9"
+  resolved "https://registry.yarnpkg.com/@salesforce/plugin-data/-/plugin-data-2.5.9.tgz#aaeeb101f3bea4fc9055ebf7efe8370d617a7a4b"
+  integrity sha512-vxwEmLL1V9R4ZwfjSZKjni8LYSliytmeLWea51PlkNjKQb01b9XQr+e8cdwKnwYYaTe76xAHHusKJ8e/ik0XwQ==
   dependencies:
-    "@oclif/core" "^2.11.7"
+    "@oclif/core" "^2.15.0"
     "@salesforce/core" "^5.2.0"
     "@salesforce/kit" "^3.0.9"
-    "@salesforce/sf-plugins-core" "^3.1.20"
+    "@salesforce/sf-plugins-core" "^3.1.22"
     "@salesforce/ts-types" "^2.0.6"
     chalk "^4.1.0"
     csv-parse "^4.16.3"
@@ -1730,69 +1730,69 @@
     shelljs "^0.8.5"
     tslib "^2"
 
-"@salesforce/plugin-info@2.6.40":
-  version "2.6.40"
-  resolved "https://registry.yarnpkg.com/@salesforce/plugin-info/-/plugin-info-2.6.40.tgz#822ab22d5d29d8318358c8ea1285b3d9abc702e7"
-  integrity sha512-l9Edp5r+yGmWbMlip4BGJhu9ls7RoNg+HTER7ufMtvDf59++dcINdtbdUQPF0toasmF+6hAyMPHL6ADa+9jpaw==
+"@salesforce/plugin-info@2.6.42":
+  version "2.6.42"
+  resolved "https://registry.yarnpkg.com/@salesforce/plugin-info/-/plugin-info-2.6.42.tgz#b0d06ad985785a7b95f4f64dac55707c2d98b3db"
+  integrity sha512-vxp7Mb2meG/CRe4ZxeqkVzhHM8lBd/s/HOiw//YLA0/+IYjYUdC3ksYlEdbYLOpFfSkiK8EIXyKnacqje0XGYg==
   dependencies:
-    "@oclif/core" "^2.11.10"
-    "@salesforce/core" "^5.2.0"
+    "@oclif/core" "^2.15.0"
+    "@salesforce/core" "^5.2.7"
     "@salesforce/kit" "^3.0.9"
-    "@salesforce/sf-plugins-core" "^3.1.14"
+    "@salesforce/sf-plugins-core" "^3.1.20"
     got "^11.8.6"
     marked "^4.3.0"
     marked-terminal "^4.2.0"
     open "^8.4.2"
-    proxy-agent "^6.3.0"
+    proxy-agent "^6.3.1"
     semver "^7.5.4"
     tslib "^2"
 
-"@salesforce/plugin-limits@2.3.33":
-  version "2.3.33"
-  resolved "https://registry.yarnpkg.com/@salesforce/plugin-limits/-/plugin-limits-2.3.33.tgz#b7ecc72ddbb7baa0c44906f8612c80c459b27c38"
-  integrity sha512-GVEpwSQXhtgvlabNqafu7QudhuufOzSv0POWcmvgnTlC65K8XBhED78WDnz5hj7AFoQ6Jx0GVjvp5nYkRLx9/g==
+"@salesforce/plugin-limits@2.3.34":
+  version "2.3.34"
+  resolved "https://registry.yarnpkg.com/@salesforce/plugin-limits/-/plugin-limits-2.3.34.tgz#13f78eea83da6723bf5167f1d0066babeed4c605"
+  integrity sha512-LQ7O5PznZW32tWh951cBOVSprKbBd+K/G2+rxnvCE3dgcH2Io9hqeiq9me6gmT3FpsMF7/sEVn+BlohG/icXTw==
   dependencies:
-    "@oclif/core" "^2.11.8"
+    "@oclif/core" "^2.15.0"
     "@salesforce/core" "^5.2.0"
     "@salesforce/kit" "^3.0.11"
-    "@salesforce/sf-plugins-core" "^3.1.20"
+    "@salesforce/sf-plugins-core" "^3.1.22"
     "@salesforce/ts-types" "^2.0.6"
     tslib "^2"
 
-"@salesforce/plugin-login@1.2.29":
-  version "1.2.29"
-  resolved "https://registry.yarnpkg.com/@salesforce/plugin-login/-/plugin-login-1.2.29.tgz#a0f601f111213f3654f274b0d2b99966ab119646"
-  integrity sha512-YpxpLnQlVfJx8D3digBSyrmzBCa9/F5EV0KY3wULRcCmNHJRF0kjZIjJh7gu5L5L+keD4bwoLsAKHrwGKv2Dkw==
+"@salesforce/plugin-login@1.2.30":
+  version "1.2.30"
+  resolved "https://registry.yarnpkg.com/@salesforce/plugin-login/-/plugin-login-1.2.30.tgz#5d011dbd848bf91f22558d52c6d41a91a17a827a"
+  integrity sha512-1gcZ0nlrCRAMe/PdV0CAnDAUMjkHV4HYkTsdvj0nGFhle8D7DefW3B/bvSapNd1KLpkN9MdQnzjt+oleYxi3MA==
   dependencies:
-    "@oclif/core" "^2.11.7"
+    "@oclif/core" "^2.15.0"
     "@salesforce/core" "^5.2.5"
-    "@salesforce/sf-plugins-core" "^3.1.16"
+    "@salesforce/sf-plugins-core" "^3.1.22"
     chalk "^4.1.2"
     inquirer "^8.2.6"
     tslib "^2"
 
-"@salesforce/plugin-marketplace@0.2.0":
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@salesforce/plugin-marketplace/-/plugin-marketplace-0.2.0.tgz#ac5493bc1af02d6fba1fd4e0a15c92c9b4207f5a"
-  integrity sha512-CpkqkBWs0c5ltpPHNyIS/mwb41c4fHhmkxzcNppacTevKgu0KCzya24BCsK1xGVR0fHIMU+TySZBRGpTySDTrw==
+"@salesforce/plugin-marketplace@0.2.1":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@salesforce/plugin-marketplace/-/plugin-marketplace-0.2.1.tgz#2dafadb30778042ce4e69f87241538c4d014cbfb"
+  integrity sha512-d7+blQj4SN6HTPXqkxm31in7eiWCtlelFjRyIbOV5Tregw8hLJ3iO9ArWQA8cl2CZEYusFA19ZoRE52DRJwNjA==
   dependencies:
     "@oclif/core" "^2.15.0"
     "@salesforce/core" "^5.2.0"
     "@salesforce/kit" "^3.0.9"
     "@salesforce/sf-plugins-core" "^3.1.14"
     got "^11"
-    proxy-agent "^6.3.0"
+    proxy-agent "^6.3.1"
     tslib "^2"
 
-"@salesforce/plugin-org@2.10.6":
-  version "2.10.6"
-  resolved "https://registry.yarnpkg.com/@salesforce/plugin-org/-/plugin-org-2.10.6.tgz#a0aa018db89ab28fd15af0502d87700ce55769aa"
-  integrity sha512-uTHjQRJY06mqDo9+IJbQpaNDmURaTnFvNtEEgnQWVPg341R5jf+TZ1c/MUjup5QDDujagNXKTQAE/2gNCQi96Q==
+"@salesforce/plugin-org@2.10.7":
+  version "2.10.7"
+  resolved "https://registry.yarnpkg.com/@salesforce/plugin-org/-/plugin-org-2.10.7.tgz#26709e9456e41ed3b3e4a9263c9dc02314c223b3"
+  integrity sha512-c2K8HsQPMWHPehAzxiX2Wk12+JEVey9ZVqRXmGl1Q3X2OEc5Q/dL9kj2C5A3zGWL1Gd/ppJN61ipBx5j591Gxw==
   dependencies:
-    "@oclif/core" "^2.11.10"
+    "@oclif/core" "^2.15.0"
     "@salesforce/core" "^5.2.0"
     "@salesforce/kit" "^3.0.9"
-    "@salesforce/sf-plugins-core" "^3.1.14"
+    "@salesforce/sf-plugins-core" "^3.1.22"
     "@salesforce/source-deploy-retrieve" "^9.7.8"
     open "^8.4.2"
     tslib "^2"
@@ -1846,15 +1846,15 @@
     fast-levenshtein "^3.0.0"
     tslib "^2"
 
-"@salesforce/plugin-sobject@0.2.6":
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/@salesforce/plugin-sobject/-/plugin-sobject-0.2.6.tgz#13c1bb7fa15be91ffa5d4cf6a5fe2d9e87858957"
-  integrity sha512-/TO+4mKfFbi5NW1LgUFF4EeXHOMmhiJzaYuv/PND14pqvsEfm7RY93/UDaelnqlLKvCXnRzgeNOXMWN2iL2ijQ==
+"@salesforce/plugin-sobject@0.2.7":
+  version "0.2.7"
+  resolved "https://registry.yarnpkg.com/@salesforce/plugin-sobject/-/plugin-sobject-0.2.7.tgz#10645a40304c81c60501ee39577f676a1e32b853"
+  integrity sha512-Tiv5IxIDnSSEe1NRKZEIjnsmiBvQLGhVQrhdN6SEAuw8R0auqQCEgzu4GsWAwRm/mqBTouVnQwl5ZS2+ysFQPg==
   dependencies:
-    "@oclif/core" "^2.11.8"
+    "@oclif/core" "^2.15.0"
     "@salesforce/core" "^5.2.0"
     "@salesforce/kit" "^3.0.9"
-    "@salesforce/sf-plugins-core" "^3.1.15"
+    "@salesforce/sf-plugins-core" "^3.1.22"
     change-case "^4.1.2"
     fast-glob "^3.3.1"
     fast-xml-parser "^4.2.7"
@@ -1946,7 +1946,7 @@
   resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.6.0.tgz#14505ebad2fb2d4f7b14837545d662766d293561"
   integrity sha512-SwhDTLucj/GRbPpxlEoDZeqlX22o+G6fiebTXTu1cZKmd1oE0W2L7SlTTgJnWck8bhTeBIgQi9cpD8c2t5ISKA==
 
-"@salesforce/sf-plugins-core@3.1.22", "@salesforce/sf-plugins-core@^3.1.14", "@salesforce/sf-plugins-core@^3.1.15", "@salesforce/sf-plugins-core@^3.1.16", "@salesforce/sf-plugins-core@^3.1.18", "@salesforce/sf-plugins-core@^3.1.20", "@salesforce/sf-plugins-core@^3.1.22":
+"@salesforce/sf-plugins-core@3.1.22", "@salesforce/sf-plugins-core@^3.1.14", "@salesforce/sf-plugins-core@^3.1.18", "@salesforce/sf-plugins-core@^3.1.20", "@salesforce/sf-plugins-core@^3.1.22":
   version "3.1.22"
   resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-3.1.22.tgz#caade6439366fe9a28c819bd3b8fef0cbb2a712a"
   integrity sha512-t8IvC+8LLzCU+skT3/FGjpkB6qm+VaL3uCbwrqgmZivzQc5tpRQpVcW9YbTgJUgkQrD58yurbkwX/jA9hMR6yg==
@@ -1958,12 +1958,12 @@
     chalk "^4"
     inquirer "^8.2.5"
 
-"@salesforce/source-deploy-retrieve@9.7.10", "@salesforce/source-deploy-retrieve@^9.7.10", "@salesforce/source-deploy-retrieve@^9.7.4", "@salesforce/source-deploy-retrieve@^9.7.8":
-  version "9.7.10"
-  resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-9.7.10.tgz#ce500519acebcab92edf947230dafbd883b53624"
-  integrity sha512-QbMrFq0V3YpHuI0Ad5kmltfs/ocMfms/NUpHr+pWZ5dbeXg7BcQWo3MgrfonzG5AWfSQ9YQs4AjJdQB0CeK+lw==
+"@salesforce/source-deploy-retrieve@9.7.13", "@salesforce/source-deploy-retrieve@^9.7.10", "@salesforce/source-deploy-retrieve@^9.7.4", "@salesforce/source-deploy-retrieve@^9.7.8":
+  version "9.7.13"
+  resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-9.7.13.tgz#85777222e157a621eb00fcef0487c682b7e3d5f7"
+  integrity sha512-QRhdepll3+ED9w4clI/RvcSLtuSbTzFPZenzrvJ2R7Pg5gXRZQIJrphEkAnY7oteVBBUxPVdYgbeuQxeoi98dg==
   dependencies:
-    "@salesforce/core" "^5.2.1"
+    "@salesforce/core" "^5.2.7"
     "@salesforce/kit" "^3.0.11"
     "@salesforce/ts-types" "^2.0.7"
     fast-levenshtein "^3.0.0"
@@ -1974,7 +1974,7 @@
     jszip "^3.10.1"
     mime "2.6.0"
     minimatch "^5.1.6"
-    proxy-agent "^6.3.0"
+    proxy-agent "^6.3.1"
     unzipper "0.10.14"
 
 "@salesforce/source-tracking@4.2.12", "@salesforce/source-tracking@^4.2.10", "@salesforce/source-tracking@^4.2.12":

From 8ddc8c0f999fd8413ac97764b66b22612cfcdc7e Mon Sep 17 00:00:00 2001
From: svc-cli-bot <svc_cli_bot@salesforce.com>
Date: Mon, 11 Sep 2023 02:09:43 +0000
Subject: [PATCH 07/16] chore(release): bump to 2.9.5

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

diff --git a/package.json b/package.json
index 295a4052..d38b7675 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/cli",
   "description": "The Salesforce CLI",
-  "version": "2.9.4",
+  "version": "2.9.5",
   "author": "Salesforce",
   "bin": {
     "sf": "./bin/run",
@@ -136,7 +136,7 @@
     "@salesforce/plugin-apex": "2.3.14",
     "@salesforce/plugin-auth": "2.8.16",
     "@salesforce/plugin-data": "2.5.9",
-    "@salesforce/plugin-deploy-retrieve": "1.17.12",
+    "@salesforce/plugin-deploy-retrieve": "1.17.13",
     "@salesforce/plugin-info": "2.6.42",
     "@salesforce/plugin-limits": "2.3.34",
     "@salesforce/plugin-login": "1.2.30",
diff --git a/yarn.lock b/yarn.lock
index 822b0b06..6eb98a22 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1714,17 +1714,17 @@
     jsforce "^2.0.0-beta.27"
     tslib "^2"
 
-"@salesforce/plugin-deploy-retrieve@1.17.12":
-  version "1.17.12"
-  resolved "https://registry.yarnpkg.com/@salesforce/plugin-deploy-retrieve/-/plugin-deploy-retrieve-1.17.12.tgz#3ecb538a0b27804575fab1f8894a19b742f7939f"
-  integrity sha512-R8LqVumWv9uK9xCZiVyctCf8KgjADL/HWyvVImQY6HsgqAaBpXIP40xAqeHXp8sd+rHZrDwB2NoqtuubRgkQyw==
+"@salesforce/plugin-deploy-retrieve@1.17.13":
+  version "1.17.13"
+  resolved "https://registry.yarnpkg.com/@salesforce/plugin-deploy-retrieve/-/plugin-deploy-retrieve-1.17.13.tgz#39547e6689c9b383e33345f691f0234b18503a2f"
+  integrity sha512-sJRcWRzLIb14Af+ELgvCfemkv7KveyoHUb1jFjftxt+ntEt/a/CvdE7WeHFdIAwdWMURHmUtQ3lo0STtVaYnOQ==
   dependencies:
     "@oclif/core" "^2.15.0"
     "@salesforce/apex-node" "^2.1.0"
     "@salesforce/core" "^5.2.7"
     "@salesforce/kit" "^3.0.9"
     "@salesforce/sf-plugins-core" "^3.1.20"
-    "@salesforce/source-deploy-retrieve" "^9.7.10"
+    "@salesforce/source-deploy-retrieve" "^9.7.13"
     "@salesforce/source-tracking" "^4.2.12"
     chalk "^4.1.2"
     shelljs "^0.8.5"
@@ -1958,7 +1958,7 @@
     chalk "^4"
     inquirer "^8.2.5"
 
-"@salesforce/source-deploy-retrieve@9.7.13", "@salesforce/source-deploy-retrieve@^9.7.10", "@salesforce/source-deploy-retrieve@^9.7.4", "@salesforce/source-deploy-retrieve@^9.7.8":
+"@salesforce/source-deploy-retrieve@9.7.13", "@salesforce/source-deploy-retrieve@^9.7.13", "@salesforce/source-deploy-retrieve@^9.7.4", "@salesforce/source-deploy-retrieve@^9.7.8":
   version "9.7.13"
   resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-9.7.13.tgz#85777222e157a621eb00fcef0487c682b7e3d5f7"
   integrity sha512-QRhdepll3+ED9w4clI/RvcSLtuSbTzFPZenzrvJ2R7Pg5gXRZQIJrphEkAnY7oteVBBUxPVdYgbeuQxeoi98dg==

From bf7d04be91e90230dba2f46cd7c9398f49ab6da9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Sep 2023 20:38:04 -0500
Subject: [PATCH 08/16] build(deps-dev): bump eslint from 8.48.0 to 8.49.0
 (#1138)

Bumps [eslint](https://github.com/eslint/eslint) from 8.48.0 to 8.49.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.48.0...v8.49.0)

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

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

diff --git a/package.json b/package.json
index d38b7675..c0cc459d 100644
--- a/package.json
+++ b/package.json
@@ -242,7 +242,7 @@
     "@typescript-eslint/parser": "^5.62.0",
     "aws-sdk": "^2.1450.0",
     "chai": "^4.3.8",
-    "eslint": "^8.48.0",
+    "eslint": "^8.49.0",
     "eslint-config-oclif": "^3.1",
     "eslint-config-oclif-typescript": "^0.2.0",
     "eslint-config-prettier": "^8.10.0",
diff --git a/yarn.lock b/yarn.lock
index 6eb98a22..a14cc705 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -534,20 +534,20 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.48.0":
-  version "8.48.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.48.0.tgz#642633964e217905436033a2bd08bf322849b7fb"
-  integrity sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==
+"@eslint/js@8.49.0":
+  version "8.49.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.49.0.tgz#86f79756004a97fa4df866835093f1df3d03c333"
+  integrity sha512-1S8uAY/MTJqVx0SC4epBq+N2yhuwtNwLbJYNZyhL2pO1ZVKn5HFXav5T41Ryzy9K9V7ZId2JB2oy/W4aCd9/2w==
 
 "@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
-"@humanwhocodes/config-array@^0.11.10":
-  version "0.11.10"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.10.tgz#5a3ffe32cc9306365fb3fd572596cd602d5e12d2"
-  integrity sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==
+"@humanwhocodes/config-array@^0.11.11":
+  version "0.11.11"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.11.tgz#88a04c570dbbc7dd943e4712429c3df09bc32844"
+  integrity sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==
   dependencies:
     "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
@@ -4867,16 +4867,16 @@ eslint@^7.27.0:
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
-eslint@^8.48.0:
-  version "8.48.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.48.0.tgz#bf9998ba520063907ba7bfe4c480dc8be03c2155"
-  integrity sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==
+eslint@^8.49.0:
+  version "8.49.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.49.0.tgz#09d80a89bdb4edee2efcf6964623af1054bf6d42"
+  integrity sha512-jw03ENfm6VJI0jA9U+8H5zfl5b+FvuU3YYvZRdZHOlU2ggJkxrlkJH4HcDrZpj6YwD8kuYqvQM8LyesoazrSOQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.6.1"
     "@eslint/eslintrc" "^2.1.2"
-    "@eslint/js" "8.48.0"
-    "@humanwhocodes/config-array" "^0.11.10"
+    "@eslint/js" "8.49.0"
+    "@humanwhocodes/config-array" "^0.11.11"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
     ajv "^6.12.4"

From 19db51198bed8d5d23bd84210e374a7000cbe3ec Mon Sep 17 00:00:00 2001
From: svc-cli-bot <svc_cli_bot@salesforce.com>
Date: Tue, 12 Sep 2023 02:08:23 +0000
Subject: [PATCH 09/16] chore(release): bump to 2.9.6

---
 package.json | 18 +++++++++---------
 yarn.lock    | 10 +++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index c0cc459d..a730a40a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/cli",
   "description": "The Salesforce CLI",
-  "version": "2.9.5",
+  "version": "2.9.6",
   "author": "Salesforce",
   "bin": {
     "sf": "./bin/run",
@@ -72,13 +72,13 @@
     "jitPlugins": {
       "@salesforce/plugin-custom-metadata": "2.2.2",
       "@salesforce/plugin-community": "2.4.1",
-      "@salesforce/plugin-dev": "1.1.10",
-      "@salesforce/plugin-devops-center": "1.1.5",
-      "@salesforce/plugin-env": "2.1.26",
-      "@salesforce/plugin-functions": "1.21.12",
-      "@salesforce/plugin-packaging": "1.24.0",
-      "@salesforce/plugin-signups": "1.4.34",
-      "@salesforce/sfdx-plugin-lwc-test": "1.0.2",
+      "@salesforce/plugin-dev": "1.2.0",
+      "@salesforce/plugin-devops-center": "1.2.0",
+      "@salesforce/plugin-env": "2.2.0",
+      "@salesforce/plugin-functions": "1.22.0",
+      "@salesforce/plugin-packaging": "1.25.0",
+      "@salesforce/plugin-signups": "1.5.0",
+      "@salesforce/sfdx-plugin-lwc-test": "1.1.0",
       "@salesforce/sfdx-scanner": "3.16.0"
     },
     "devPlugins": [
@@ -126,7 +126,7 @@
     "@oclif/plugin-commands": "2.2.25",
     "@oclif/plugin-help": "5.2.19",
     "@oclif/plugin-not-found": "2.4.1",
-    "@oclif/plugin-plugins": "3.5.0",
+    "@oclif/plugin-plugins": "3.6.0",
     "@oclif/plugin-search": "0.0.22",
     "@oclif/plugin-update": "3.2.3",
     "@oclif/plugin-version": "1.3.10",
diff --git a/yarn.lock b/yarn.lock
index a14cc705..751d29fa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1228,12 +1228,12 @@
     chalk "^4"
     fast-levenshtein "^3.0.0"
 
-"@oclif/plugin-plugins@3.5.0":
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/@oclif/plugin-plugins/-/plugin-plugins-3.5.0.tgz#48f4ec8d17bd3c76e87da581e40ef8f05b03817d"
-  integrity sha512-eE1P5jaFLLAeJvs2ilnGIHbxlhr7Z+3qgn/2uQoAGyozbSltAVkRRQ0LGPrGsqiwdgpgSpR2fPcvaskFanKfyA==
+"@oclif/plugin-plugins@3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@oclif/plugin-plugins/-/plugin-plugins-3.6.0.tgz#b218609d809dec1e92eaac67b962ff6feb39cba1"
+  integrity sha512-xjcwI1QaZwlTqxr6lfbSbGQHATZ2ZJwwBcTyqw5ooMFpO8SUtJ+iAGQmy8mWWsAr03UANsNLU5XjuYTq+nyu4g==
   dependencies:
-    "@oclif/core" "^2.11.10"
+    "@oclif/core" "^2.15.0"
     chalk "^4.1.2"
     debug "^4.3.4"
     http-call "^5.2.2"

From 8ffb30871fbc154c7ebff5e3f6427d1a9c77eb0a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Sep 2023 23:27:33 -0500
Subject: [PATCH 10/16] build(deps-dev): bump oclif from 3.14.0 to 3.15.1
 (#1140)

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

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 21 +++++++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index a730a40a..85c14bc0 100644
--- a/package.json
+++ b/package.json
@@ -256,7 +256,7 @@
     "husky": "^7.0.4",
     "mocha": "^9.2.2",
     "nyc": "^15.1.0",
-    "oclif": "^3.14.0",
+    "oclif": "^3.15.1",
     "prettier": "^2.8.8",
     "pretty-quick": "^3.1.3",
     "sinon": "^11.1.2",
diff --git a/yarn.lock b/yarn.lock
index 751d29fa..686d9377 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2901,6 +2901,13 @@ async-lock@^1.1.0:
   resolved "https://registry.yarnpkg.com/async-lock/-/async-lock-1.4.0.tgz#c8b6630eff68fbbdd8a5b6eb763dac3bfbb8bf02"
   integrity sha512-coglx5yIWuetakm3/1dsX9hxCNox22h7+V80RQOu2XUUMidtArxKoZoOtHUPuR84SycKTXzgGzAUR5hJxujyJQ==
 
+async-retry@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/async-retry/-/async-retry-1.3.3.tgz#0e7f36c04d8478e7a58bdbed80cedf977785f280"
+  integrity sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw==
+  dependencies:
+    retry "0.13.1"
+
 async@^3.2.3:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
@@ -8211,15 +8218,16 @@ object.values@^1.1.5, object.values@^1.1.6:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
-oclif@^3.14.0:
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/oclif/-/oclif-3.14.0.tgz#d0a0cd2f4c3e6135aff6de1733ff0704000a95b3"
-  integrity sha512-IlTb6WcbL7DxKSBp/TlC+wj7FhelIVu5AHBoW5+ABJ9GjXMv27sAY6F+RfEXqQaMu8OwRP9t/1sAKR+3wMlX8w==
+oclif@^3.15.1:
+  version "3.15.1"
+  resolved "https://registry.yarnpkg.com/oclif/-/oclif-3.15.1.tgz#94ca0e057cbe048211f0978b1b90341ea712fee1"
+  integrity sha512-3xpR4rOQ1aTJC3Mr+TaguZapJqZ0360gvM+UKKsYBz4B5dqRCfPp75E2qWRmzaUmCjo+LYanMdD/h7Ja/yNPVA==
   dependencies:
     "@oclif/core" "^2.11.4"
     "@oclif/plugin-help" "^5.2.14"
     "@oclif/plugin-not-found" "^2.3.32"
     "@oclif/plugin-warn-if-update-available" "^2.0.44"
+    async-retry "^1.3.3"
     aws-sdk "^2.1231.0"
     concurrently "^7.6.0"
     debug "^4.3.3"
@@ -9246,6 +9254,11 @@ ret@~0.1.10:
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
+retry@0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
+  integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==
+
 retry@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"

From 220b1dfbc6b5b297462277cc9575745dcc1723e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Sep 2023 02:25:56 -0500
Subject: [PATCH 11/16] build(deps-dev): bump aws-sdk from 2.1450.0 to 2.1455.0
 (#1139)

Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1450.0 to 2.1455.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1450.0...v2.1455.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 85c14bc0..934b4888 100644
--- a/package.json
+++ b/package.json
@@ -240,7 +240,7 @@
     "@types/debug": "^4.1.8",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
-    "aws-sdk": "^2.1450.0",
+    "aws-sdk": "^2.1455.0",
     "chai": "^4.3.8",
     "eslint": "^8.49.0",
     "eslint-config-oclif": "^3.1",
diff --git a/yarn.lock b/yarn.lock
index 686d9377..eadd33e9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2933,10 +2933,10 @@ available-typed-arrays@^1.0.5:
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
-aws-sdk@^2.1231.0, aws-sdk@^2.1413.0, aws-sdk@^2.1450.0:
-  version "2.1450.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1450.0.tgz#d54a0bfc6d54391b3d39ff73c0398f435082c14c"
-  integrity sha512-EfZLImJ0XNuIdlx5McHX0rJbOiQHz+vEjnpGV08gXSzaq2cN3vSjE+L2Dju7KmaIh85FTYvLOf2REUuCLDpSRg==
+aws-sdk@^2.1231.0, aws-sdk@^2.1413.0, aws-sdk@^2.1455.0:
+  version "2.1455.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1455.0.tgz#d4b98912e54ffdc06e868287d87c8bc6b4c3f00a"
+  integrity sha512-OCH3YcWZ1mqePNRcOxvnB4F270++X44K+/cKA7op2HYRKjTkIJjFVqJGVdMDPQAHlc0GTCKYD6CJOUEhR2pp7w==
   dependencies:
     buffer "4.9.2"
     events "1.1.1"

From 2b6d6523622c7a179bcbc7b37d627877a160e12a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Sep 2023 05:28:55 -0500
Subject: [PATCH 12/16] build(deps-dev): bump eslint-plugin-jsdoc from 46.5.1
 to 46.6.0 (#1137)

Bumps [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) from 46.5.1 to 46.6.0.
- [Release notes](https://github.com/gajus/eslint-plugin-jsdoc/releases)
- [Changelog](https://github.com/gajus/eslint-plugin-jsdoc/blob/main/.releaserc)
- [Commits](https://github.com/gajus/eslint-plugin-jsdoc/compare/v46.5.1...v46.6.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 934b4888..085684a5 100644
--- a/package.json
+++ b/package.json
@@ -251,7 +251,7 @@
     "eslint-config-salesforce-typescript": "^1.1.1",
     "eslint-plugin-header": "^3.1.1",
     "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-jsdoc": "^46.5.1",
+    "eslint-plugin-jsdoc": "^46.6.0",
     "globby": "^11.1.0",
     "husky": "^7.0.4",
     "mocha": "^9.2.2",
diff --git a/yarn.lock b/yarn.lock
index eadd33e9..6c7d4074 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4674,10 +4674,10 @@ eslint-plugin-jsdoc@^35.1.2:
     semver "^7.3.5"
     spdx-expression-parse "^3.0.1"
 
-eslint-plugin-jsdoc@^46.5.1:
-  version "46.5.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-46.5.1.tgz#79be44c9f7b3bbc52917cae12f356979b7d58e8a"
-  integrity sha512-CPbvKprmEuJYoxMj5g8gXfPqUGgcqMM6jpH06Kp4pn5Uy5MrPkFKzoD7UFp2E4RBzfXbJz1+TeuEivwFVMkXBg==
+eslint-plugin-jsdoc@^46.6.0:
+  version "46.6.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-46.6.0.tgz#513e41911a3081a15fe6a94490002e8d8f7b71d9"
+  integrity sha512-T/1gzsvnX45qABzyPEonEhFDttkTn7Igm/X89TXIkTLBOsNl2GYtyBqQPZGXZZ8J5VBzEhiCMvI2P2kXX4dnFw==
   dependencies:
     "@es-joy/jsdoccomment" "~0.40.1"
     are-docs-informative "^0.0.2"

From 3ecc72f3856b6ca8c6db4e6200bbaee1c3910111 Mon Sep 17 00:00:00 2001
From: svc-cli-bot <svc_cli_bot@salesforce.com>
Date: Wed, 13 Sep 2023 02:09:30 +0000
Subject: [PATCH 13/16] chore(release): bump to 2.9.7

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

diff --git a/package.json b/package.json
index 085684a5..d81631c6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/cli",
   "description": "The Salesforce CLI",
-  "version": "2.9.6",
+  "version": "2.9.7",
   "author": "Salesforce",
   "bin": {
     "sf": "./bin/run",
@@ -126,7 +126,7 @@
     "@oclif/plugin-commands": "2.2.25",
     "@oclif/plugin-help": "5.2.19",
     "@oclif/plugin-not-found": "2.4.1",
-    "@oclif/plugin-plugins": "3.6.0",
+    "@oclif/plugin-plugins": "3.6.1",
     "@oclif/plugin-search": "0.0.22",
     "@oclif/plugin-update": "3.2.3",
     "@oclif/plugin-version": "1.3.10",
diff --git a/yarn.lock b/yarn.lock
index 6c7d4074..e263ac68 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1228,10 +1228,10 @@
     chalk "^4"
     fast-levenshtein "^3.0.0"
 
-"@oclif/plugin-plugins@3.6.0":
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/@oclif/plugin-plugins/-/plugin-plugins-3.6.0.tgz#b218609d809dec1e92eaac67b962ff6feb39cba1"
-  integrity sha512-xjcwI1QaZwlTqxr6lfbSbGQHATZ2ZJwwBcTyqw5ooMFpO8SUtJ+iAGQmy8mWWsAr03UANsNLU5XjuYTq+nyu4g==
+"@oclif/plugin-plugins@3.6.1":
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/@oclif/plugin-plugins/-/plugin-plugins-3.6.1.tgz#e7a7b5ec68b3c0d2a159e1d784f96af674e03d4a"
+  integrity sha512-+Av9eVQ+WdjZbYZBDmSMrhw5vNTVIKSh3gC61dFHxXITMq8EQ2kJECFRfJ9lJbYvj8QjpPp9ISGieIerZNetmw==
   dependencies:
     "@oclif/core" "^2.15.0"
     chalk "^4.1.2"

From 1375b31069ec61e20f5309db36b2378e7c0f22f0 Mon Sep 17 00:00:00 2001
From: mshanemc <shane.mclaughlin@salesforce.com>
Date: Wed, 13 Sep 2023 14:26:26 -0700
Subject: [PATCH 14/16] ci: clean up stampy buckets after uploading to cli
 bucket

---
 .github/workflows/get-signed-from-stampy.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/get-signed-from-stampy.yml b/.github/workflows/get-signed-from-stampy.yml
index 340a4325..08863037 100644
--- a/.github/workflows/get-signed-from-stampy.yml
+++ b/.github/workflows/get-signed-from-stampy.yml
@@ -32,9 +32,6 @@ jobs:
         run: |
           node scripts/stampy-signed-upload.js
       - name: clean up stampy in/out buckets
-        # waiting on Stampy to enable delete permission on these buckets
-        # at that point, we can make this an hourly job
-        if: false
         env:
           STAMPY_UNSIGNED_BUCKET: ${{ secrets.STAMPY_UNSIGNED_BUCKET }}
           STAMPY_SIGNED_BUCKET: ${{ secrets.STAMPY_SIGNED_BUCKET }}

From fa8f6fda5a63839e89ba18518a455e0e2789b8da Mon Sep 17 00:00:00 2001
From: mshanemc <shane.mclaughlin@salesforce.com>
Date: Wed, 13 Sep 2023 14:30:28 -0700
Subject: [PATCH 15/16] ci: include arn

---
 .github/workflows/get-signed-from-stampy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/get-signed-from-stampy.yml b/.github/workflows/get-signed-from-stampy.yml
index 08863037..ebe461fd 100644
--- a/.github/workflows/get-signed-from-stampy.yml
+++ b/.github/workflows/get-signed-from-stampy.yml
@@ -33,6 +33,7 @@ jobs:
           node scripts/stampy-signed-upload.js
       - name: clean up stampy in/out buckets
         env:
+          STAMPY_ARN: ${{ secrets.STAMPY_ARN }}
           STAMPY_UNSIGNED_BUCKET: ${{ secrets.STAMPY_UNSIGNED_BUCKET }}
           STAMPY_SIGNED_BUCKET: ${{ secrets.STAMPY_SIGNED_BUCKET }}
           AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}}

From 156a036b7fffa8554b07d4671dcdd142342f2435 Mon Sep 17 00:00:00 2001
From: mshanemc <shane.mclaughlin@salesforce.com>
Date: Wed, 13 Sep 2023 14:34:14 -0700
Subject: [PATCH 16/16] ci: hourly

---
 .github/workflows/get-signed-from-stampy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/get-signed-from-stampy.yml b/.github/workflows/get-signed-from-stampy.yml
index ebe461fd..cc67ef56 100644
--- a/.github/workflows/get-signed-from-stampy.yml
+++ b/.github/workflows/get-signed-from-stampy.yml
@@ -1,8 +1,8 @@
 name: get-signed-installers-from-stampy
 on:
   workflow_dispatch:
-  # schedule:
-  # - cron: '25 * * * *'
+  schedule:
+    - cron: '25 * * * *'
 
 jobs:
   get-signed-from-stampy: