fix(org): clear default org ref after logging out target org - W-23069610

QA: logging out the default org (via Log Out from All Orgs) left the status
bar org picker showing the now-absent org.

updateConfigAndStateAggregatorsEffect refreshes TargetOrgRef by re-fetching
the connection, but swallowed the failure with Effect.void when the target
org no longer exists. watchConfigFiles clears the ref on that same failure,
but the workspace-only ('**/*') file watcher never fires for GLOBAL config
changes, so the manual refresh path is the only signal after logout.

Expose ConnectionService.clearDefaultOrg (delegates to clearDefaultOrgRef)
and clear the ref when getConnection fails, mirroring watchConfigFiles.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: mshanemc

.claude/skills/services-extension-consumption/references/connection-service.md

@@ -22,6 +22,18 @@ After auth files or tokens change on disk, drop cached JSForce connections so th
 yield* api.services.ConnectionService.invalidateCachedConnections();
 ```
 
+### clearDefaultOrg
+
+Clear the reactive default-org state (preserving webUserId/cliId). Use after a config change removes the target org so the org picker / status bar stop showing the now-absent org:
+
+```typescript
+yield* api.services.ConnectionService.getConnection().pipe(
+  Effect.catchAll(() => api.services.ConnectionService.clearDefaultOrg())
+);
+```
+
+Mirrors `watchConfigFiles` failure path for code that mutates GLOBAL config (e.g. logout) that workspace-only file watcher never observes.
+
 ## Errors
 
 - `NoTargetOrgConfiguredError` - No target org

packages/salesforcedx-vscode-org-browser/test/jest/index.test.ts

@@ -172,7 +172,8 @@ const MockConnectionServiceLayer = Layer.succeed(
   new ConnectionService({
     getConnection: () => Effect.sync(() => mockConnection),
     invalidateCachedConnections: () => Effect.void,
-    listAllAuthorizations: () => Effect.succeed([])
+    listAllAuthorizations: () => Effect.succeed([]),
+    clearDefaultOrg: () => Effect.void
   } as const)
 );
 

packages/salesforcedx-vscode-org/src/util/orgUtil.ts

@@ -137,7 +137,12 @@ export const updateConfigAndStateAggregatorsEffect = Effect.fn('updateConfigAndS
   });
   yield* api.services.ConfigService.invalidateConfigAggregator();
   yield* api.services.ConnectionService.invalidateCachedConnections();
-  yield* api.services.ConnectionService.getConnection().pipe(Effect.catchAll(() => Effect.void));
+  // getConnection refreshes TargetOrgRef on success; on failure (e.g. the target org was just
+  // logged out) clear the ref so the org picker / status bar drop the now-absent org. Mirrors
+  // watchConfigFiles, which the workspace-only file watcher never fires for GLOBAL config changes.
+  yield* api.services.ConnectionService.getConnection().pipe(
+    Effect.catchAll(() => api.services.ConnectionService.clearDefaultOrg())
+  );
 });
 
 export const updateConfigAndStateAggregators = async (): Promise<void> => {

packages/salesforcedx-vscode-org/test/jest/util/orgUtil.test.ts

@@ -394,6 +394,7 @@ describe('updateConfigAndStateAggregators', () => {
   let getConnectionMock: jest.Mock;
   let invalidateCachedConnectionsMock: jest.Mock;
   let invalidateConfigAggregatorMock: jest.Mock;
+  let clearDefaultOrgMock: jest.Mock;
 
   beforeEach(() => {
     jest.restoreAllMocks();
@@ -408,6 +409,7 @@ describe('updateConfigAndStateAggregators', () => {
     getConnectionMock = jest.fn().mockReturnValue(Effect.succeed({}));
     invalidateCachedConnectionsMock = jest.fn().mockReturnValue(Effect.void);
     invalidateConfigAggregatorMock = jest.fn().mockReturnValue(Effect.void);
+    clearDefaultOrgMock = jest.fn().mockReturnValue(Effect.void);
 
     const mockServicesApi = {
       services: {
@@ -416,7 +418,8 @@ describe('updateConfigAndStateAggregators', () => {
         },
         ConnectionService: {
           getConnection: getConnectionMock,
-          invalidateCachedConnections: invalidateCachedConnectionsMock
+          invalidateCachedConnections: invalidateCachedConnectionsMock,
+          clearDefaultOrg: clearDefaultOrgMock
         }
       }
     } as unknown as SalesforceVSCodeServicesApi;
@@ -440,14 +443,16 @@ describe('updateConfigAndStateAggregators', () => {
     expect(invalidateConfigAggregatorMock).toHaveBeenCalled();
     expect(invalidateCachedConnectionsMock).toHaveBeenCalled();
     expect(getConnectionMock).toHaveBeenCalled();
+    expect(clearDefaultOrgMock).not.toHaveBeenCalled();
   });
 
-  it('should not throw when getConnection fails', async () => {
+  it('should clear the default org ref when getConnection fails (target org logged out)', async () => {
     getConnectionMock.mockReturnValue(Effect.fail(new Error('No target org configured')));
 
     await expect(updateConfigAndStateAggregators()).resolves.toBeUndefined();
     expect(invalidateConfigAggregatorMock).toHaveBeenCalled();
     expect(invalidateCachedConnectionsMock).toHaveBeenCalled();
     expect(getConnectionMock).toHaveBeenCalled();
+    expect(clearDefaultOrgMock).toHaveBeenCalled();
   });
 });

packages/salesforcedx-vscode-services/src/core/connectionService.ts

@@ -20,7 +20,7 @@ import { ExtensionContextService } from '../vscode/extensionContextService';
 import { SettingsService } from '../vscode/settingsService';
 import { AliasService } from './alias';
 import { ConfigService } from './configService';
-import { getDefaultOrgRef } from './defaultOrgRef';
+import { clearDefaultOrgRef, getDefaultOrgRef } from './defaultOrgRef';
 import { DefaultOrgInfoSchema } from './schemas/defaultOrgInfo';
 import { getOrgFromConnection, unknownToErrorCause } from './shared';
 
@@ -269,7 +269,15 @@ export class ConnectionService extends Effect.Service<ConnectionService>()('Conn
       });
     });
 
-    return { getConnection, invalidateCachedConnections, listAllAuthorizations };
+    /**
+     * Clears the reactive default-org state (preserving webUserId/cliId). Callers use this after a
+     * config change removes the target org (e.g. logout) so the org picker / status bar stop showing
+     * the now-absent org. Mirrors the `watchConfigFiles` failure path for code paths that mutate the
+     * GLOBAL config, which the workspace-only `**\/*` file watcher never observes.
+     */
+    const clearDefaultOrg = clearDefaultOrgRef;
+
+    return { getConnection, invalidateCachedConnections, listAllAuthorizations, clearDefaultOrg };
   })
 }) {}
 

packages/salesforcedx-vscode-services/test/jest/core/metadataDescribeService.test.ts

@@ -33,7 +33,8 @@ const createMockConnectionService = (listResult: ListItem | ListItem[]): Layer.L
           }
         } as unknown as Connection),
       invalidateCachedConnections: () => Effect.void,
-      listAllAuthorizations: () => Effect.succeed([])
+      listAllAuthorizations: () => Effect.succeed([]),
+      clearDefaultOrg: () => Effect.void
     })
   );
 

packages/salesforcedx-vscode-services/test/jest/core/templateService.test.ts

@@ -93,7 +93,8 @@ const createMockConnectionService = (): Layer.Layer<ConnectionService> =>
     ConnectionService.make({
       getConnection: () => Effect.succeed({ version: '60.0' } as unknown as import('@salesforce/core').Connection),
       invalidateCachedConnections: () => Effect.void,
-      listAllAuthorizations: () => Effect.succeed([])
+      listAllAuthorizations: () => Effect.succeed([]),
+      clearDefaultOrg: () => Effect.void
     })
   );
 

packages/salesforcedx-vscode-services/test/jest/core/traceFlagService.test.ts

@@ -67,7 +67,8 @@ const buildMockConnectionLayer = (opts: {
           query: querySpy
         } as unknown as Connection),
       invalidateCachedConnections: () => Effect.void,
-      listAllAuthorizations: () => Effect.succeed([])
+      listAllAuthorizations: () => Effect.succeed([]),
+      clearDefaultOrg: () => Effect.void
     })
   );
   return { layer, toolingSpy, querySpy };
@@ -348,7 +349,8 @@ const buildToolingMutationLayer = (opts: {
           tooling: { create: createSpy, delete: deleteSpy }
         } as unknown as Connection),
       invalidateCachedConnections: () => Effect.void,
-      listAllAuthorizations: () => Effect.succeed([])
+      listAllAuthorizations: () => Effect.succeed([]),
+      clearDefaultOrg: () => Effect.void
     })
   );
   return { layer, createSpy, deleteSpy };