Merge remote-tracking branch 'origin/main' into cd/logging

Author: cristiand391

CHANGELOG.md

@@ -1,3 +1,15 @@
+## [3.22.35](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.22.34...3.22.35) (2025-07-26)
+
+### Bug Fixes
+
+- **deps:** bump @oclif/multi-stage-output from 0.8.17 to 0.8.19 ([f8c0dad](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/f8c0dad291bb264c3640d4b4ea6c8c4931aaac60))
+
+## [3.22.34](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.22.33...3.22.34) (2025-07-23)
+
+### Bug Fixes
+
+- **deps:** bump form-data from 4.0.3 to 4.0.4 ([42a88bd](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/42a88bd633ebeae10fa4364e07b4a273eb125d6c))
+
 ## [3.22.33](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.22.32...3.22.33) (2025-07-14)
 
 ### Bug Fixes

README.md

@@ -141,7 +141,14 @@ FLAG DESCRIPTIONS
     If you specify this flag, don’t specify --metadata or --source-dir.
 ```
 
+<<<<<<< HEAD
 _See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/convert/mdapi.ts)_
+||||||| 2eb4732
+_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/convert/mdapi.ts)_
+=======
+_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/convert/mdapi.ts)_
+
+> > > > > > > origin/main
 
 ## `sf project convert source`
 
@@ -214,7 +221,14 @@ FLAG DESCRIPTIONS
     Override the api version used for api requests made by this command
 ```
 
+<<<<<<< HEAD
 _See code: [src/commands/project/convert/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/convert/source.ts)_
+||||||| 2eb4732
+_See code: [src/commands/project/convert/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/convert/source.ts)_
+=======
+_See code: [src/commands/project/convert/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/convert/source.ts)_
+
+> > > > > > > origin/main
 
 ## `sf project convert source-behavior`
 
@@ -273,7 +287,14 @@ EXAMPLES
     $ sf project convert source-behavior --behavior decomposePermissionSetBeta --dry-run --preserve-temp-dir
 ```
 
+<<<<<<< HEAD
 _See code: [src/commands/project/convert/source-behavior.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/convert/source-behavior.ts)_
+||||||| 2eb4732
+_See code: [src/commands/project/convert/source-behavior.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/convert/source-behavior.ts)_
+=======
+_See code: [src/commands/project/convert/source-behavior.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/convert/source-behavior.ts)_
+
+> > > > > > > origin/main
 
 ## `sf project delete source`
 
@@ -413,7 +434,14 @@ FLAG DESCRIPTIONS
     - Separate the test names with spaces: --tests Test1 Test2 "Test With Space"
 ```
 
+<<<<<<< HEAD
 _See code: [src/commands/project/delete/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/delete/source.ts)_
+||||||| 2eb4732
+_See code: [src/commands/project/delete/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/delete/source.ts)_
+=======
+_See code: [src/commands/project/delete/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/delete/source.ts)_
+
+> > > > > > > origin/main
 
 ## `sf project delete tracking`
 
@@ -450,7 +478,14 @@ EXAMPLES
     $ sf project delete tracking --target-org my-scratch
 ```
 
+<<<<<<< HEAD
 _See code: [src/commands/project/delete/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/delete/tracking.ts)_
+||||||| 2eb4732
+_See code: [src/commands/project/delete/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/delete/tracking.ts)_
+=======
+_See code: [src/commands/project/delete/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/delete/tracking.ts)_
+
+> > > > > > > origin/main
 
 ## `sf project deploy cancel`
 
@@ -522,7 +557,14 @@ FLAG DESCRIPTIONS
     project deploy report".
 ```
 
+<<<<<<< HEAD
 _See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/cancel.ts)_
+||||||| 2eb4732
+_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/deploy/cancel.ts)_
+=======
+_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/deploy/cancel.ts)_
+
+> > > > > > > origin/main
 
 ## `sf project deploy preview`
 
@@ -605,7 +647,14 @@ FLAG DESCRIPTIONS
     All child components are included. If you specify this flag, don’t specify --metadata or --source-dir.
 ```
 
+<<<<<<< HEAD
 _See code: [src/commands/project/deploy/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/preview.ts)_
+||||||| 2eb4732
+_See code: [src/commands/project/deploy/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/deploy/preview.ts)_
+=======
+_See code: [src/commands/project/deploy/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/deploy/preview.ts)_
+
+> > > > > > > origin/main
 
 ## `sf project deploy quick`
 
@@ -689,7 +738,14 @@ FLAG DESCRIPTIONS
     deploy report".
 ```
 
+<<<<<<< HEAD
 _See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/quick.ts)_
+||||||| 2eb4732
+_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/deploy/quick.ts)_
+=======
+_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/deploy/quick.ts)_
+
+> > > > > > > origin/main
 
 ## `sf project deploy report`
 
@@ -781,7 +837,14 @@ FLAG DESCRIPTIONS
     --coverage-formatters lcov --coverage-formatters clover
 ```
 
+<<<<<<< HEAD
 _See code: [src/commands/project/deploy/report.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/report.ts)_
+||||||| 2eb4732
+_See code: [src/commands/project/deploy/report.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/deploy/report.ts)_
+=======
+_See code: [src/commands/project/deploy/report.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/deploy/report.ts)_
+
+> > > > > > > origin/main
 
 ## `sf project deploy resume`
 
@@ -866,7 +929,14 @@ FLAG DESCRIPTIONS
     --coverage-formatters lcov --coverage-formatters clover
 ```
 
+<<<<<<< HEAD
 _See code: [src/commands/project/deploy/resume.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/resume.ts)_
+||||||| 2eb4732
+_See code: [src/commands/project/deploy/resume.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/deploy/resume.ts)_
+=======
+_See code: [src/commands/project/deploy/resume.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/deploy/resume.ts)_
+
+> > > > > > > origin/main
 
 ## `sf project deploy start`
 
@@ -1102,7 +1172,14 @@ FLAG DESCRIPTIONS
     --coverage-formatters lcov --coverage-formatters clover
 ```
 
+<<<<<<< HEAD
 _See code: [src/commands/project/deploy/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/start.ts)_
+||||||| 2eb4732
+_See code: [src/commands/project/deploy/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/deploy/start.ts)_
+=======
+_See code: [src/commands/project/deploy/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/deploy/start.ts)_
+
+> > > > > > > origin/main
 
 ## `sf project deploy validate`
 
@@ -1275,7 +1352,14 @@ FLAG DESCRIPTIONS
     --coverage-formatters lcov --coverage-formatters clover
 ```
 
+<<<<<<< HEAD
 _See code: [src/commands/project/deploy/validate.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/validate.ts)_
+||||||| 2eb4732
+_See code: [src/commands/project/deploy/validate.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/deploy/validate.ts)_
+=======
+_See code: [src/commands/project/deploy/validate.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/deploy/validate.ts)_
+
+> > > > > > > origin/main
 
 ## `sf project generate manifest`
 
@@ -1371,7 +1455,14 @@ EXAMPLES
     $ sf project generate manifest --from-org [email protected] --excluded-metadata StandardValueSet
 ```
 
+<<<<<<< HEAD
 _See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/generate/manifest.ts)_
+||||||| 2eb4732
+_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/generate/manifest.ts)_
+=======
+_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/generate/manifest.ts)_
+
+> > > > > > > origin/main
 
 ## `sf project list ignored`
 
@@ -1413,7 +1504,14 @@ EXAMPLES
     $ sf project list ignored --source-dir package.xml
 ```
 
+<<<<<<< HEAD
 _See code: [src/commands/project/list/ignored.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/list/ignored.ts)_
+||||||| 2eb4732
+_See code: [src/commands/project/list/ignored.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/list/ignored.ts)_
+=======
+_See code: [src/commands/project/list/ignored.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/list/ignored.ts)_
+
+> > > > > > > origin/main
 
 ## `sf project reset tracking`
 
@@ -1462,7 +1560,14 @@ EXAMPLES
     $ sf project reset tracking --revision 30
 ```
 
+<<<<<<< HEAD
 _See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/reset/tracking.ts)_
+||||||| 2eb4732
+_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/reset/tracking.ts)_
+=======
+_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/reset/tracking.ts)_
+
+> > > > > > > origin/main
 
 ## `sf project retrieve preview`
 
@@ -1516,7 +1621,14 @@ FLAG DESCRIPTIONS
     production orgs.
 ```
 
+<<<<<<< HEAD
 _See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/retrieve/preview.ts)_
+||||||| 2eb4732
+_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/retrieve/preview.ts)_
+=======
+_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/retrieve/preview.ts)_
+
+> > > > > > > origin/main
 
 ## `sf project retrieve start`
 
@@ -1689,6 +1801,13 @@ FLAG DESCRIPTIONS
     If you specify this flag, don’t specify --metadata or --source-dir.
 ```
 
+<<<<<<< HEAD
 _See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/retrieve/start.ts)_
+||||||| 2eb4732
+_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/retrieve/start.ts)_
+=======
+_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/retrieve/start.ts)_
+
+> > > > > > > origin/main
 
 <!-- commandsstop -->

package.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "@inquirer/prompts": "^7.5.3",
     "@oclif/core": "^4.3.0",
-    "@oclif/multi-stage-output": "^0.8.14",
+    "@oclif/multi-stage-output": "^0.8.19",
     "@salesforce/apex-node": "^8.1.31",
     "@salesforce/core": "^8.18.1",
     "@salesforce/kit": "^3.2.3",

yarn.lock

@@ -1595,10 +1595,10 @@
     wordwrap "^1.0.0"
     wrap-ansi "^7.0.0"
 
-"@oclif/multi-stage-output@^0.8.14":
-  version "0.8.17"
-  resolved "https://registry.yarnpkg.com/@oclif/multi-stage-output/-/multi-stage-output-0.8.17.tgz#92ec74abf58554da95f062a570bb99cff3546b25"
-  integrity sha512-mnemcZQfznoJB5JF0esLDMsUGCUP/hMRmi2et1PmMYIBGuOZUAJrlXtiPNi/ye8Uw60BR7k4Vr2GklNtSRawSg==
+"@oclif/multi-stage-output@^0.8.19":
+  version "0.8.19"
+  resolved "https://registry.yarnpkg.com/@oclif/multi-stage-output/-/multi-stage-output-0.8.19.tgz#ebc887e95366534c4fec740bf6420bd324862145"
+  integrity sha512-OkfYIbZ0vaMotUWR8HLm6eA9s+j2pn3KR+p42XeEkFlmrxOxVmomyJrNW+TgWnjMqQZsQYG6m2JVn4HCmzHt3w==
   dependencies:
     "@oclif/core" "^4"
     "@types/react" "^18.3.12"
@@ -4928,9 +4928,9 @@ form-data-encoder@^2.1.2:
   integrity sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==
 
 form-data@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.3.tgz#608b1b3f3e28be0fccf5901fc85fb3641e5cf0ae"
-  integrity sha512-qsITQPfmvMOSAdeyZ+12I1c+CKSstAFAwu+97zrnWAbIr5u8wfsExUzCesVLC8NgHuRUqNN4Zy6UPWUTRGslcA==
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.4.tgz#784cdcce0669a9d68e94d11ac4eea98088edd2c4"
+  integrity sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.8"