fix: Add message to sandbox response -W-21072171

schemas/org-create-sandbox.json

@@ -9,6 +9,9 @@
         "SandboxUsername": {
           "type": "string"
         },
+        "Message": {
+          "type": "string"
+        },
         "Id": {
           "type": "string"
         },

schemas/org-refresh-sandbox.json

@@ -9,6 +9,9 @@
         "SandboxUsername": {
           "type": "string"
         },
+        "Message": {
+          "type": "string"
+        },
         "Id": {
           "type": "string"
         },

schemas/org-resume-sandbox.json

@@ -9,6 +9,9 @@
         "SandboxUsername": {
           "type": "string"
         },
+        "Message": {
+          "type": "string"
+        },
         "Id": {
           "type": "string"
         },

src/commands/org/resume/sandbox.ts

@@ -162,17 +162,25 @@ export default class ResumeSandbox extends SandboxCommandBase<SandboxCommandResp
       });
       return this.getSandboxCommandResponse();
     } catch (err) {
+      const errMessage = err instanceof Error ? err.message : String(err);
+
       if (this.latestSandboxProgressObj && this.pollingTimeOut) {
         void lifecycle.emit(SandboxEvents.EVENT_ASYNC_RESULT, undefined);
         process.exitCode = 68;
-        return this.latestSandboxProgressObj;
+        const response = this.getSandboxCommandResponse();
+        response.Message = errMessage;
+        return response;
       } else if (
         this.latestSandboxProgressObj &&
         err instanceof SfError &&
-        err.name === 'SandboxCreateNotCompleteError'
+        ['SandboxCreateNotCompleteError', 'SandboxAuthNotCompleteError', 'SandboxAuthIncompleteError'].includes(
+          err.name
+        )
       ) {
         process.exitCode = 68;
-        return this.latestSandboxProgressObj;
+        const response = this.getSandboxCommandResponse();
+        response.Message = errMessage;
+        return response;
       }
       throw err;
     }

src/shared/sandboxCommandBase.ts

@@ -36,6 +36,7 @@ const messages = Messages.loadMessages('@salesforce/plugin-org', 'sandboxbase');
 
 export type SandboxCommandResponse = SandboxProcessObject & {
   SandboxUsername?: string;
+  Message?: string;
 };
 
 export abstract class SandboxCommandBase<T> extends SfCommand<T> {