From f919c714fce9a823c435ed76cd0c29f98c0c94ca Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sun, 15 Mar 2026 19:38:35 +0100
Subject: [PATCH] frontend-app-api: stop resetting the tree for api discovery

Collect bootstrap and deferred API factories without mutating app node instances, so conditional API roots stay deferred and visible API instances can survive finalization unchanged.

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
Made-with: Cursor
---
 .../src/wiring/createSpecializedApp.test.tsx  | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/packages/frontend-app-api/src/wiring/createSpecializedApp.test.tsx b/packages/frontend-app-api/src/wiring/createSpecializedApp.test.tsx
index 080de78177..1aff292256 100644
--- a/packages/frontend-app-api/src/wiring/createSpecializedApp.test.tsx
+++ b/packages/frontend-app-api/src/wiring/createSpecializedApp.test.tsx
@@ -1366,6 +1366,75 @@ describe('createSpecializedApp', () => {
       ).resolves.toBeInTheDocument();
     });
 
+    it('should defer conditional api roots without resetting visible api instances', () => {
+      const featureFlagsApi = {
+        isActive: jest.fn((name: string) => name === 'test-flag'),
+        registerFlag: jest.fn(),
+        getRegisteredFlags: () => [],
+        save: jest.fn(),
+      } as unknown as typeof featureFlagsApiRef.T;
+      const visibleApiExtension = ApiBlueprint.make({
+        name: 'visible-api',
+        params: defineParams =>
+          defineParams({
+            api: createApiRef<{ value: string }>({ id: 'test.visible-api' }),
+            deps: {},
+            factory: () => ({ value: 'visible' }),
+          }),
+      });
+      const deferredApiExtension = ApiBlueprint.make({
+        name: 'deferred-api',
+        params: defineParams =>
+          defineParams({
+            api: createApiRef<{ value: string }>({ id: 'test.deferred-api' }),
+            deps: {},
+            factory: () => ({ value: 'deferred' }),
+          }),
+      }).override({
+        if: { featureFlags: { $contains: 'test-flag' } },
+      });
+      const preparedApp = prepareSpecializedApp({
+        features: [
+          makeAppPlugin(),
+          createFrontendPlugin({
+            pluginId: 'test',
+            featureFlags: [{ name: 'test-flag' }],
+            extensions: [
+              visibleApiExtension,
+              deferredApiExtension,
+              ApiBlueprint.make({
+                name: 'feature-flags',
+                params: defineParams =>
+                  defineParams({
+                    api: featureFlagsApiRef,
+                    deps: {},
+                    factory: () => featureFlagsApi,
+                  }),
+              }),
+            ],
+          }),
+        ],
+      });
+
+      const bootstrapTree = preparedApp.getBootstrapApp().tree;
+      const apiNodes = bootstrapTree.root.edges.attachments.get('apis') ?? [];
+      const visibleApiNode = apiNodes.find(
+        node => node.spec.id === 'api:test/visible-api',
+      );
+      const deferredApiNode = apiNodes.find(
+        node => node.spec.id === 'api:test/deferred-api',
+      );
+
+      expect(visibleApiNode?.instance).toBeDefined();
+      expect(deferredApiNode?.instance).toBeUndefined();
+
+      const visibleApiInstance = visibleApiNode?.instance;
+      preparedApp.finalize();
+
+      expect(visibleApiNode?.instance).toBe(visibleApiInstance);
+      expect(deferredApiNode?.instance).toBeDefined();
+    });
+
     it('should defer app root children until finalize', async () => {
       const identityApi = {
         getProfileInfo: async () => ({ displayName: 'Test User' }),