From ff8e1d4c77634d86c4666ac1fad65fb3ffc0092b Mon Sep 17 00:00:00 2001
From: soridalac <sorida.lac@salesforce.com>
Date: Tue, 14 Apr 2026 10:10:42 -0700
Subject: [PATCH 1/3] fix: add message to response

---
 src/commands/org/resume/sandbox.ts | 14 +++++++++++---
 src/shared/sandboxCommandBase.ts   |  1 +
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/commands/org/resume/sandbox.ts b/src/commands/org/resume/sandbox.ts
index b3faf10e..78b8b088 100644
--- a/src/commands/org/resume/sandbox.ts
+++ b/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;
     }
diff --git a/src/shared/sandboxCommandBase.ts b/src/shared/sandboxCommandBase.ts
index 1ac6e005..74046c40 100644
--- a/src/shared/sandboxCommandBase.ts
+++ b/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> {

From b4ec86d01ab29a62afebb8cb2e0a9d52f0a67869 Mon Sep 17 00:00:00 2001
From: soridalac <sorida.lac@salesforce.com>
Date: Mon, 20 Apr 2026 12:20:10 -0700
Subject: [PATCH 2/3] fix: add message to sandbox response

---
 schemas/org-create-sandbox.json    | 3 +++
 schemas/org-refresh-sandbox.json   | 3 +++
 schemas/org-resume-sandbox.json    | 3 +++
 src/commands/org/resume/sandbox.ts | 4 ++--
 src/shared/sandboxCommandBase.ts   | 2 +-
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/schemas/org-create-sandbox.json b/schemas/org-create-sandbox.json
index 598a1d90..dc8581c8 100644
--- a/schemas/org-create-sandbox.json
+++ b/schemas/org-create-sandbox.json
@@ -9,6 +9,9 @@
         "SandboxUsername": {
           "type": "string"
         },
+        "Message": {
+          "type": "string"
+        },
         "Id": {
           "type": "string"
         },
diff --git a/schemas/org-refresh-sandbox.json b/schemas/org-refresh-sandbox.json
index 598a1d90..dc8581c8 100644
--- a/schemas/org-refresh-sandbox.json
+++ b/schemas/org-refresh-sandbox.json
@@ -9,6 +9,9 @@
         "SandboxUsername": {
           "type": "string"
         },
+        "Message": {
+          "type": "string"
+        },
         "Id": {
           "type": "string"
         },
diff --git a/schemas/org-resume-sandbox.json b/schemas/org-resume-sandbox.json
index 598a1d90..dc8581c8 100644
--- a/schemas/org-resume-sandbox.json
+++ b/schemas/org-resume-sandbox.json
@@ -9,6 +9,9 @@
         "SandboxUsername": {
           "type": "string"
         },
+        "Message": {
+          "type": "string"
+        },
         "Id": {
           "type": "string"
         },
diff --git a/src/commands/org/resume/sandbox.ts b/src/commands/org/resume/sandbox.ts
index 78b8b088..ec982b09 100644
--- a/src/commands/org/resume/sandbox.ts
+++ b/src/commands/org/resume/sandbox.ts
@@ -168,7 +168,7 @@ export default class ResumeSandbox extends SandboxCommandBase<SandboxCommandResp
         void lifecycle.emit(SandboxEvents.EVENT_ASYNC_RESULT, undefined);
         process.exitCode = 68;
         const response = this.getSandboxCommandResponse();
-        response.message = errMessage;
+        response.Message = errMessage;
         return response;
       } else if (
         this.latestSandboxProgressObj &&
@@ -179,7 +179,7 @@ export default class ResumeSandbox extends SandboxCommandBase<SandboxCommandResp
       ) {
         process.exitCode = 68;
         const response = this.getSandboxCommandResponse();
-        response.message = errMessage;
+        response.Message = errMessage;
         return response;
       }
       throw err;
diff --git a/src/shared/sandboxCommandBase.ts b/src/shared/sandboxCommandBase.ts
index 74046c40..e9771aa5 100644
--- a/src/shared/sandboxCommandBase.ts
+++ b/src/shared/sandboxCommandBase.ts
@@ -36,7 +36,7 @@ const messages = Messages.loadMessages('@salesforce/plugin-org', 'sandboxbase');
 
 export type SandboxCommandResponse = SandboxProcessObject & {
   SandboxUsername?: string;
-  message?: string;
+  Message?: string;
 };
 
 export abstract class SandboxCommandBase<T> extends SfCommand<T> {

From 12848dace643f92ec4cf272e6866bf47bf5e42ac Mon Sep 17 00:00:00 2001
From: soridalac <sorida.lac@salesforce.com>
Date: Thu, 23 Apr 2026 08:27:09 -0700
Subject: [PATCH 3/3] fix: update nut test

---
 test/nut/sandboxResume.nut.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/nut/sandboxResume.nut.ts b/test/nut/sandboxResume.nut.ts
index 7fa19972..2c86ec68 100644
--- a/test/nut/sandboxResume.nut.ts
+++ b/test/nut/sandboxResume.nut.ts
@@ -95,7 +95,8 @@ describe('Sandbox Resume', () => {
 
     const result = await ResumeSandbox.run(['--name', sbxName, '-o', hubOrgUsername, '--json']);
 
-    expect(result).to.deep.equal(sbxProcess);
+    expect(result).to.include(sbxProcess);
+    expect(result.SandboxUsername).to.equal(`${hubOrgUsername}.${sbxName}`);
     expect(toolingQueryStub.calledOnce, 'toolingQueryStub').to.be.true;
 
     // check the sandbox cache entry
@@ -118,7 +119,8 @@ describe('Sandbox Resume', () => {
 
     const result = await ResumeSandbox.run(['--job-id', sbxProcess.Id, '-o', hubOrgUsername, '--json']);
 
-    expect(result).to.deep.equal(sbxProcess);
+    expect(result).to.include(sbxProcess);
+    expect(result.SandboxUsername).to.equal(`${hubOrgUsername}.${sbxName}`);
     expect(toolingQueryStub.calledOnce, 'toolingQueryStub').to.be.true;
 
     // check the sandbox cache entry