fix(services): clear SfProject instance cache on project file change - W-23095743

globalSfProjectCache invalidation alone left the stale value: SfProject.resolve
returns a path-memoized instance (sfProject.js:436) whose parsed sfProjectJson is
also memoized (sfProject.js:468), so a fresh cache lookup re-resolved the SAME
instance and the edited sourceApiVersion was never read. Also clear the core
SfProject.instances Map so retrieve/deploy/manifest pick up mid-session edits.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Author: mshanemc

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

@@ -59,8 +59,19 @@ const globalSfProjectCache = Effect.runSync(
   }).pipe(Effect.withSpan('sfProjectCache'))
 );
 
-/** Invalidate a single SfProject cache entry (per-key, NOT invalidateAll — preserves sibling workspace entries). */
-export const invalidateSfProjectCache = (cacheKey: string) => globalSfProjectCache.invalidate(cacheKey);
+/**
+ * Invalidate the SfProject cache so the next `getSfProject` re-reads sfdx-project.json from disk.
+ *
+ * Two caches must be dropped together:
+ * (1) our `globalSfProjectCache` — per-key invalidate (preserves sibling workspace entries).
+ * (2) `@salesforce/core`'s static `SfProject.instances` Map — `SfProject.resolve` returns the memoized
+ * instance per path, and each instance memoizes its parsed `sfProjectJson` (sfProject.js:468). Without
+ * clearing it, a fresh `globalSfProjectCache` lookup re-resolves the SAME stale instance, so the edited
+ * `sourceApiVersion` is never picked up. `clearInstances()` is the only public API (no per-path delete);
+ * clearing all is safe — siblings simply re-resolve from disk on next use.
+ */
+export const invalidateSfProjectCache = (cacheKey: string) =>
+  globalSfProjectCache.invalidate(cacheKey).pipe(Effect.tap(() => Effect.sync(() => SfProject.clearInstances())));
 
 const TOOLS_DIR = 'tools';
 const SOBJECTS_DIR = 'sobjects';

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

@@ -5,6 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
+import { SfProject } from '@salesforce/core';
 import * as Effect from 'effect/Effect';
 import * as Fiber from 'effect/Fiber';
 import * as Layer from 'effect/Layer';
@@ -46,6 +47,8 @@ const runWatcherTest = (publishUri: string) => {
 };
 
 describe('watchSfProjectFile', () => {
+  afterEach(() => jest.restoreAllMocks());
+
   it('invalidates the SfProject cache when sfdx-project.json changes', async () => {
     const spy = await runWatcherTest(PROJECT_FILE_PATH);
     expect(spy).toHaveBeenCalledTimes(1);
@@ -62,3 +65,15 @@ describe('watchSfProjectFile', () => {
     expect(spy).not.toHaveBeenCalled();
   });
 });
+
+describe('invalidateSfProjectCache', () => {
+  afterEach(() => jest.restoreAllMocks());
+
+  it('clears the @salesforce/core SfProject instance cache so memoized sfProjectJson is dropped', async () => {
+    // Without clearInstances, SfProject.resolve returns the same memoized instance (sfProject.js:436),
+    // whose parsed sfProjectJson is also memoized (sfProject.js:468) -> stale sourceApiVersion survives.
+    const clearSpy = jest.spyOn(SfProject, 'clearInstances').mockImplementation(() => {});
+    await Effect.runPromise(projectService.invalidateSfProjectCache('/Users/testuser/project'));
+    expect(clearSpy).toHaveBeenCalledTimes(1);
+  });
+});