feat: use @oclif/multi-stage-output

Author: mdonnalley

src/commands/project/deploy/start.ts

@@ -320,7 +320,6 @@ export default class DeployMetadata extends SfCommand<DeployResultJson> {
     if (flags.async) {
       ms.goto('Done', { status: 'Queued', targetOrg: username });
       ms.stop();
-      this.log();
       if (flags['coverage-formatters']) {
         this.warn(messages.getMessage('asyncCoverageJunitWarning'));
       }
@@ -337,7 +336,6 @@ export default class DeployMetadata extends SfCommand<DeployResultJson> {
     );
 
     deploy.onUpdate((data) => {
-      // if (!this.jsonEnabled()) console.log(data);
       if (
         data.numberComponentsDeployed === data.numberComponentsTotal &&
         data.numberTestsTotal > 0 &&
@@ -359,9 +357,17 @@ export default class DeployMetadata extends SfCommand<DeployResultJson> {
       ms.stop();
     });
 
-    deploy.onCancel(() => ms.stop());
+    deploy.onCancel((data) => {
+      ms.updateData({ mdapiDeploy: data, status: mdTransferMessages.getMessage(data?.status ?? 'Canceled') });
+
+      ms.stop(new Error('Deploy canceled'));
+    });
 
     deploy.onError((error: Error) => {
+      if (error.message.includes('client has timed out')) {
+        ms.updateData({ status: 'Client Timeout' });
+      }
+
       ms.stop(error);
       throw error;
     });

src/commands/project/retrieve/start.ts

@@ -227,10 +227,15 @@ export default class RetrieveMetadata extends SfCommand<RetrieveResultJson> {
       retrieve.onFinish((data) => {
         ms.goto('Done', { status: mdTransferMessages.getMessage(data.response.status) });
       });
-      retrieve.onCancel((data) =>
-        ms.goto('Done', { status: mdTransferMessages.getMessage(data?.status ?? 'Canceled') })
-      );
+      retrieve.onCancel((data) => {
+        ms.updateData({ status: mdTransferMessages.getMessage(data?.status ?? 'Canceled') });
+        ms.stop(new Error('Retrieve canceled'));
+      });
       retrieve.onError((error: Error) => {
+        if (error.message.includes('client has timed out')) {
+          ms.updateData({ status: 'Client Timeout' });
+        }
+
         ms.stop(error);
         throw error;
       });