fix(org): surface CLI output and fix idempotency in org delete

- Stream sf CLI output to Salesforce Org Management channel
- Append failure details when delete fails or throws
- Check auth file exists via FsService before removeAuth (fixes Target file doesn't exist)
- Pass OUTPUT_CHANNEL to OrgDeleteDefaultExecutor

Made-with: Cursor

Author: peternhale

packages/salesforcedx-vscode-org/src/commands/orgDelete.ts

@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { AuthRemover } from '@salesforce/core';
+import { AuthRemover, Global } from '@salesforce/core';
 import { ExtensionProviderService, sfProjectPreconditionChecker } from '@salesforce/effect-ext-utils';
 import { Command, SfCommandBuilder } from '@salesforce/salesforcedx-utils';
 import {
@@ -19,8 +19,9 @@ import {
   workspaceUtils
 } from '@salesforce/salesforcedx-utils-vscode';
 import * as Effect from 'effect/Effect';
+import * as path from 'node:path';
 import * as vscode from 'vscode';
-import { OUTPUT_CHANNEL } from '../channels';
+import { channelService, OUTPUT_CHANNEL } from '../channels';
 import { getOrgRuntime } from '../extensionProvider';
 import { nls } from '../messages';
 import { PromptConfirmGatherer } from '../parameterGatherers/promptConfirmGatherer';
@@ -55,6 +56,15 @@ const unsetTargetDevHubIfMatch = Effect.fn('OrgDelete.unsetTargetDevHubIfMatch')
   }
 );
 
+/** Checks if the auth file exists in .sfdx or .sf; sf org delete may already remove it (idempotent). */
+const authFileExists = Effect.fn('OrgDelete.authFileExists')(function* (username: string) {
+  const api = yield* (yield* ExtensionProviderService).getServicesApi;
+  const authFileName = `${username}.json`;
+  const inSfdx = yield* api.services.FsService.fileOrFolderExists(path.join(Global.SFDX_DIR, authFileName));
+  if (inSfdx) return true;
+  return yield* api.services.FsService.fileOrFolderExists(path.join(Global.SF_DIR, authFileName));
+});
+
 /** Runs sf org:delete:scratch or org:delete:sandbox for a single org and resolves when done. */
 const runDeleteCli = (username: string, orgType: 'scratch' | 'sandbox'): Promise<boolean> => {
   const deleteArg = orgType === 'sandbox' ? 'org:delete:sandbox' : 'org:delete:scratch';
@@ -73,6 +83,8 @@ const runDeleteCli = (username: string, orgType: 'scratch' | 'sandbox'): Promise
       env: { SF_JSON_TO_STDOUT: 'true' }
     }).execute(cancellationTokenSource.token);
 
+    channelService.streamCommandOutput(execution);
+
     execution.processExitSubject.subscribe(data => {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
       const exitCode = Array.isArray(data) ? data[0] : data;
@@ -96,26 +108,39 @@ class OrgDeleteExecutor extends LibraryCommandletExecutor<{ orgs: OrgToDelete[]
         const aliases = await getOrgRuntime().runPromise(getAliasesForUsername(username));
         const success = await runDeleteCli(username, orgType);
         if (success) {
-          await authRemover.removeAuth(username);
+          // sf org delete scratch may already remove the auth file; only call removeAuth if file exists (idempotent)
+          const authFileExistsResult = await getOrgRuntime().runPromise(authFileExists(username));
+          if (authFileExistsResult) {
+            await authRemover.removeAuth(username);
+          }
           await getOrgRuntime().runPromise(removeOrgAliases(username));
           await getOrgRuntime().runPromise(unsetTargetOrgIfMatch(username, aliases));
           await getOrgRuntime().runPromise(unsetTargetDevHubIfMatch(username, aliases));
         } else {
           allSucceeded = false;
+          channelService.appendLine(
+            nls.localize('org_delete_failed_for_org', username, orgType === 'scratch' ? 'scratch org' : 'sandbox')
+          );
         }
       }
       await updateConfigAndStateAggregators();
       return allSucceeded;
     } catch (e) {
       const err = e instanceof Error ? e : new Error(String(e));
       telemetryService.sendException('org_delete_selected', `Error: name = ${err.name} message = ${err.message}`);
+      channelService.appendLine(err.message);
+      channelService.showChannelOutput();
       return false;
     }
   }
 }
 
 /** Executor for deleting the default org (no picker). */
 class OrgDeleteDefaultExecutor extends SfCommandletExecutor<{}> {
+  constructor() {
+    super(OUTPUT_CHANNEL);
+  }
+
   public build(_data: {}): Command {
     return new SfCommandBuilder()
       .withDescription(nls.localize('org_delete_default_text'))

packages/salesforcedx-vscode-org/src/extensionProvider.ts

@@ -47,6 +47,7 @@ export const buildAllServicesLayer = (context: ExtensionContext) =>
         ExtensionProviderServiceLive,
         api.services.ExtensionContextServiceLayer(context),
         api.services.ChannelServiceLayer(displayName),
+        api.services.FsService.Default,
         api.services.AliasService.Default,
         api.services.ConfigService.Default,
         api.services.ConnectionService.Default,

packages/salesforcedx-vscode-org/src/messages/i18n.ts

@@ -55,6 +55,7 @@ export const messages = {
   org_logout_all_text: 'SFDX: Log Out from Authorized Orgs',
   org_logout_default_text: 'SFDX: Log Out from Default Org',
   org_logout_no_default_org: 'No default org to logout from',
+  org_delete_failed_for_org: 'Failed to delete %s (%s). Check the output above for details.',
   org_delete_select_orgs_placeholder: 'Select scratch orgs and sandboxes to delete',
   org_delete_confirm_prompt: 'Permanently delete %d org(s)? This cannot be undone.',
   org_delete_confirm_label: 'Delete',

packages/salesforcedx-vscode-services/src/index.ts

@@ -20,14 +20,12 @@ import { ConfigService } from './core/configService';
 import { ConnectionService } from './core/connectionService';
 import { getDefaultOrgRef } from './core/defaultOrgRef';
 import { ExecuteAnonymousService } from './core/executeAnonymousService';
-import { subscribeLifecycleWarnings } from './core/lifecycleWarningListener';
 import { MetadataDeleteService } from './core/metadataDeleteService';
 import { MetadataDeployService } from './core/metadataDeployService';
 import { MetadataDescribeService } from './core/metadataDescribeService';
 import { MetadataRegistryService } from './core/metadataRegistryService';
 import { MetadataRetrieveService } from './core/metadataRetrieveService';
 import { ProjectService } from './core/projectService';
-import { retrieveOnLoadEffect } from './core/retrieveOnLoad';
 import { SourceTrackingService } from './core/sourceTrackingService';
 import { TemplateService, TemplateType } from './core/templateService';
 import { TraceFlagItemStruct, TraceFlagService } from './core/traceFlagService';
@@ -38,7 +36,6 @@ import { isItReadOnlyLayer } from './virtualFsProvider/fileSystemProvider';
 import { fileSystemSetup } from './virtualFsProvider/fileSystemSetup';
 import { IndexedDBStorageServiceShared } from './virtualFsProvider/indexedDbStorage';
 import { ChannelServiceLayer, ChannelService } from './vscode/channelService';
-import { watchSettingsService } from './vscode/configWatcher';
 import { watchDefaultOrgContext } from './vscode/context';
 import { watchApexTestContext, watchPackageDirectoriesContext } from './vscode/editorContext';
 import { EditorService } from './vscode/editorService';
@@ -210,9 +207,7 @@ const activationEffect = Effect.fn('activationEffect')(function* (context: vscod
         // watch active editor changes to update package directories context
         Effect.forkIn(watchPackageDirectoriesContext(), scope),
         // watch active editor changes to update apex test context
-        Effect.forkIn(watchApexTestContext(), scope),
-        // watch alias.json for changes and refresh defaultOrgRef.aliases accordingly
-        Effect.forkIn(watchDefaultOrgAliases(), scope)
+        Effect.forkIn(watchApexTestContext(), scope)
       ],
       { concurrency: 'unbounded' }
     );
@@ -227,7 +222,9 @@ const activationEffect = Effect.fn('activationEffect')(function* (context: vscod
       // watch active editor changes to update package directories context
       Effect.forkIn(watchPackageDirectoriesContext(), scope),
       // watch active editor changes to update apex test context
-      Effect.forkIn(watchApexTestContext(), scope)
+      Effect.forkIn(watchApexTestContext(), scope),
+      // watch alias.json for changes and refresh defaultOrgRef.aliases accordingly
+      Effect.forkIn(watchDefaultOrgAliases(), scope)
     ],
     {
       concurrency: 'unbounded'