fix: always warn on expired/deleted scratch orgs

Author: cristiand391

messages/list.md

@@ -46,7 +46,7 @@ No active scratch orgs found. Specify --all to see all scratch orgs.
 
 # deleteOrgs
 
-You have %s expired or deleted local scratch org authorizations. To remove authorizations for inactive orgs, run "org list --clean".
+You have %s expired or deleted local scratch org authorizations. To remove authorizations for inactive orgs, run "sf org list --clean".%s
 
 # noOrgsFound
 

src/commands/org/list.ts

@@ -12,6 +12,7 @@ import ansis, { type Ansis } from 'ansis';
 import { OrgListUtil, identifyActiveOrgByStatus } from '../../shared/orgListUtil.js';
 import { getStyledObject } from '../../shared/orgHighlighter.js';
 import { ExtendedAuthFields, FullyPopulatedScratchOrgFields } from '../../shared/orgTypes.js';
+import { EOL } from 'node:os';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-org', 'list');
@@ -87,8 +88,8 @@ export class OrgListCommand extends SfCommand<OrgListResult> {
       await this.cleanScratchOrgs(groupedSortedOrgs.expiredScratchOrgs, !flags['no-prompt']);
     }
 
-    if (groupedSortedOrgs.expiredScratchOrgs.length > 10 && !flags.clean) {
-      this.warn(messages.getMessage('deleteOrgs', [groupedSortedOrgs.expiredScratchOrgs.length]));
+    if (groupedSortedOrgs.expiredScratchOrgs.length >= 1 && !flags.clean) {
+      this.warn(messages.getMessage('deleteOrgs', [groupedSortedOrgs.expiredScratchOrgs.length, EOL]));
     }
 
     const result = {