fix: check cache keys, add helpful error when a miss happens

Author: WillieRuemmele

messages/resume_scratch.md

@@ -4,9 +4,11 @@ Resume the creation of an incomplete scratch org.
 
 # description
 
-When the original "<%= config.bin %> org create scratch" command either times out or is run with the --async flag, it displays a job ID.
+When the original "<%= config.bin %> org create scratch" command either times out or is run with the --async flag, it
+displays a job ID.
 
-Run this command by either passing it a job ID or using the --use-most-recent flag to specify the most recent incomplete scratch org.
+Run this command by either passing it a job ID or using the --use-most-recent flag to specify the most recent incomplete
+scratch org.
 
 # examples
 
@@ -36,6 +38,10 @@ Use the job ID of the most recent incomplete scratch org.
 
 There are no recent job IDs (ScratchOrgInfo requests) in your cache. Maybe it completed or already resumed?
 
+# error.jobIdMismatch
+
+There are no recent job IDs (ScratchOrgInfo requests) in your cache that match %s. Maybe it completed?
+
 # success
 
 Your scratch org is ready.

src/commands/org/resume/scratch.ts

@@ -7,14 +7,15 @@
 
 import { strict as assert } from 'node:assert';
 
-import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
+import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
 import {
+  Lifecycle,
   Messages,
-  scratchOrgResume,
   ScratchOrgCache,
-  Lifecycle,
   ScratchOrgLifecycleEvent,
   scratchOrgLifecycleEventName,
+  scratchOrgResume,
+  SfError,
 } from '@salesforce/core';
 import { ScratchCreateResponse } from '../../../shared/orgTypes.js';
 import { buildStatus } from '../../../shared/scratchOrgOutput.js';
@@ -54,7 +55,7 @@ export default class EnvResumeScratch extends SfCommand<ScratchCreateResponse> {
 
     // oclif doesn't know that the exactlyOne flag will ensure that one of these is set, and there we definitely have a jobID.
     assert(jobId);
-    const { hubBaseUrl } = cache.get(jobId);
+    const hubBaseUrl = cache.get(jobId)?.hubBaseUrl;
     let lastStatus: string | undefined;
 
     lifecycle.on<ScratchOrgLifecycleEvent>(scratchOrgLifecycleEventName, async (data): Promise<void> => {
@@ -66,11 +67,21 @@ export default class EnvResumeScratch extends SfCommand<ScratchCreateResponse> {
     this.log();
     this.spinner.start('Creating Scratch Org');
 
-    const { username, scratchOrgInfo, authFields, warnings } = await scratchOrgResume(jobId);
-    this.spinner.stop(lastStatus);
+    try {
+      const { username, scratchOrgInfo, authFields, warnings } = await scratchOrgResume(jobId);
+      this.spinner.stop(lastStatus);
 
-    this.log();
-    this.logSuccess(messages.getMessage('success'));
-    return { username, scratchOrgInfo, authFields, warnings, orgId: authFields?.orgId };
+      this.log();
+      this.logSuccess(messages.getMessage('success'));
+      return { username, scratchOrgInfo, authFields, warnings, orgId: authFields?.orgId };
+    } catch (e) {
+      if (cache.keys() && (e as Error).name === 'CacheMissError') {
+        // we have something in the cache, but it didn't match what the user passed in
+        throw messages.createError('error.jobIdMismatch', [jobId]);
+      } else {
+        throw SfError.wrap(e);
+      }
+      return {} as ScratchCreateResponse;
+    }
   }
 }