From 4c1d6608a05b1d68449be4dd3c197e18dea71402 Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Mon, 20 Jul 2026 17:05:20 +0430
Subject: [PATCH 01/26] fix: disable edit navigation for pending agents

---
 .../Tables/AgentsTable/AgentsTableRow.tsx         | 15 +++++++++++----
 src/components/Tables/AgentsTable/index.tsx       |  2 +-
 src/pages/settings/Agents/AgentsPage.tsx          |  6 ++++--
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/components/Tables/AgentsTable/AgentsTableRow.tsx b/src/components/Tables/AgentsTable/AgentsTableRow.tsx
index 21d2b0c4d534..12af60999680 100644
--- a/src/components/Tables/AgentsTable/AgentsTableRow.tsx
+++ b/src/components/Tables/AgentsTable/AgentsTableRow.tsx
@@ -40,7 +40,8 @@ export default function AgentsTableRow({item, rowIndex, shouldUseNarrowTableLayo
 
     const avatarSize = shouldUseNarrowTableLayout ? CONST.AVATAR_SIZE.DEFAULT : CONST.AVATAR_SIZE.SMALL;
     const isPendingDeletion = item.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-    const isPendingAddOrDelete = item.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD || isPendingDeletion;
+    const isPendingAdd = item.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD;
+    const isPendingAddOrDelete = isPendingAdd || isPendingDeletion;
     const areActionsDisabled = isPendingAddOrDelete || item.accountID <= 0 || !item.login;
     const accessibilityLabel = [item.displayName, item.login].filter(Boolean).join(', ');
     const selectedButtonInnerStyle = item.selected ? styles.buttonDefaultHovered : undefined;
@@ -79,12 +80,18 @@ export default function AgentsTableRow({item, rowIndex, shouldUseNarrowTableLayo
                             <TextWithTooltip
                                 shouldShowTooltip
                                 text={item.displayName}
-                                style={[styles.optionDisplayName, styles.pre, isPendingDeletion && styles.offlineFeedbackDeleted]}
+                                style={[styles.optionDisplayName, styles.pre, isPendingDeletion && styles.offlineFeedbackDeleted, isPendingAdd && styles.offlineFeedbackPending]}
                             />
                             <TextWithTooltip
                                 shouldShowTooltip
                                 text={item.login}
-                                style={[styles.textLabelSupporting, styles.lh16, styles.pre, isPendingDeletion && styles.offlineFeedbackDeleted]}
+                                style={[
+                                    styles.textLabelSupporting,
+                                    styles.lh16,
+                                    styles.pre,
+                                    isPendingDeletion && styles.offlineFeedbackDeleted,
+                                    isPendingAdd && styles.offlineFeedbackPending,
+                                ]}
                             />
                         </View>
                     </View>
@@ -115,7 +122,7 @@ export default function AgentsTableRow({item, rowIndex, shouldUseNarrowTableLayo
                                 <Button
                                     size={CONST.BUTTON_SIZE.SMALL}
                                     onPress={item.action}
-                                    isDisabled={isPendingDeletion}
+                                    isDisabled={isPendingAddOrDelete || !item.action}
                                     innerStyles={selectedButtonInnerStyle}
                                     sentryLabel={CONST.SENTRY_LABEL.AGENTS.EDIT}
                                 >
diff --git a/src/components/Tables/AgentsTable/index.tsx b/src/components/Tables/AgentsTable/index.tsx
index ae2381ddd6d8..f928690c389e 100644
--- a/src/components/Tables/AgentsTable/index.tsx
+++ b/src/components/Tables/AgentsTable/index.tsx
@@ -30,7 +30,7 @@ type AgentRowData = TableData & {
     login: string;
     errors?: OnyxCommon.Errors;
     pendingAction?: OnyxCommon.PendingAction;
-    action: () => void;
+    action?: () => void;
     onChatPress: () => void;
     onCopilotPress: () => void;
     dismissError: () => void;
diff --git a/src/pages/settings/Agents/AgentsPage.tsx b/src/pages/settings/Agents/AgentsPage.tsx
index 0ef384f8fa3a..10162318dbdc 100644
--- a/src/pages/settings/Agents/AgentsPage.tsx
+++ b/src/pages/settings/Agents/AgentsPage.tsx
@@ -86,7 +86,9 @@ function AgentsPage() {
             return [];
         }
         const pendingAction = agentPrompt?.pendingAction;
+        const isPendingAdd = pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD;
         const isPendingDeletion = pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+        const isPendingAddOrDelete = isPendingAdd || isPendingDeletion;
 
         if (!isOffline && isPendingDeletion) {
             return [];
@@ -108,8 +110,8 @@ function AgentsPage() {
                 login: details.login ?? '',
                 pendingAction,
                 errors: Object.keys(rowErrors).length > 0 ? rowErrors : undefined,
-                disabled: isPendingDeletion,
-                action: () => Navigation.navigate(ROUTES.SETTINGS_AGENTS_EDIT.getRoute(accountID)),
+                disabled: isPendingAddOrDelete,
+                action: isPendingAdd ? undefined : () => Navigation.navigate(ROUTES.SETTINGS_AGENTS_EDIT.getRoute(accountID)),
                 onChatPress: () => chatWithAgent(accountID),
                 onCopilotPress: () => switchToDelegator(details.login ?? ''),
                 dismissError: () => handleErrorClose(pendingAction, accountID),

From cfeff19657d141cac90bf36fe9fde0cd25013c72 Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Thu, 23 Jul 2026 09:55:09 +0430
Subject: [PATCH 02/26] Fix optimistic agent edit page lookup

---
 src/ONYXKEYS.ts                               |  4 +++
 .../Tables/AgentsTable/AgentsTableRow.tsx     | 15 +++-------
 src/components/Tables/AgentsTable/index.tsx   |  2 +-
 src/pages/settings/Agents/AgentsPage.tsx      |  6 ++--
 src/pages/settings/Agents/EditAgentPage.tsx   |  4 ++-
 .../unit/pages/settings/EditAgentPageTest.tsx | 28 +++++++++++++++++++
 6 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index c8cdd0673528..a7d8adfc3542 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -83,6 +83,9 @@ const ONYXKEYS = {
     /** Contains all the personalDetails the user has access to, keyed by accountID */
     PERSONAL_DETAILS_LIST: 'personalDetailsList',
 
+    /** Maps optimistic agent accountIDs to the real accountIDs returned by CreateAgent */
+    OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING: 'optimisticAgentAccountIDMapping',
+
     /** Contains all the private personal details of the user */
     PRIVATE_PERSONAL_DETAILS: 'private_personalDetails',
 
@@ -1523,6 +1526,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.STATUS_DRAFT_CUSTOM_CLEAR_AFTER_DATE]: string;
     [ONYXKEYS.INPUT_FOCUSED]: boolean;
     [ONYXKEYS.PERSONAL_DETAILS_LIST]: OnyxTypes.PersonalDetailsList;
+    [ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING]: Record<string, number>;
     [ONYXKEYS.PRIVATE_PERSONAL_DETAILS]: OnyxTypes.PrivatePersonalDetails;
     [ONYXKEYS.PERSONAL_DETAILS_METADATA]: Record<string, OnyxTypes.PersonalDetailsMetadata>;
     [ONYXKEYS.TASK]: OnyxTypes.Task;
diff --git a/src/components/Tables/AgentsTable/AgentsTableRow.tsx b/src/components/Tables/AgentsTable/AgentsTableRow.tsx
index 12af60999680..21d2b0c4d534 100644
--- a/src/components/Tables/AgentsTable/AgentsTableRow.tsx
+++ b/src/components/Tables/AgentsTable/AgentsTableRow.tsx
@@ -40,8 +40,7 @@ export default function AgentsTableRow({item, rowIndex, shouldUseNarrowTableLayo
 
     const avatarSize = shouldUseNarrowTableLayout ? CONST.AVATAR_SIZE.DEFAULT : CONST.AVATAR_SIZE.SMALL;
     const isPendingDeletion = item.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-    const isPendingAdd = item.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD;
-    const isPendingAddOrDelete = isPendingAdd || isPendingDeletion;
+    const isPendingAddOrDelete = item.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD || isPendingDeletion;
     const areActionsDisabled = isPendingAddOrDelete || item.accountID <= 0 || !item.login;
     const accessibilityLabel = [item.displayName, item.login].filter(Boolean).join(', ');
     const selectedButtonInnerStyle = item.selected ? styles.buttonDefaultHovered : undefined;
@@ -80,18 +79,12 @@ export default function AgentsTableRow({item, rowIndex, shouldUseNarrowTableLayo
                             <TextWithTooltip
                                 shouldShowTooltip
                                 text={item.displayName}
-                                style={[styles.optionDisplayName, styles.pre, isPendingDeletion && styles.offlineFeedbackDeleted, isPendingAdd && styles.offlineFeedbackPending]}
+                                style={[styles.optionDisplayName, styles.pre, isPendingDeletion && styles.offlineFeedbackDeleted]}
                             />
                             <TextWithTooltip
                                 shouldShowTooltip
                                 text={item.login}
-                                style={[
-                                    styles.textLabelSupporting,
-                                    styles.lh16,
-                                    styles.pre,
-                                    isPendingDeletion && styles.offlineFeedbackDeleted,
-                                    isPendingAdd && styles.offlineFeedbackPending,
-                                ]}
+                                style={[styles.textLabelSupporting, styles.lh16, styles.pre, isPendingDeletion && styles.offlineFeedbackDeleted]}
                             />
                         </View>
                     </View>
@@ -122,7 +115,7 @@ export default function AgentsTableRow({item, rowIndex, shouldUseNarrowTableLayo
                                 <Button
                                     size={CONST.BUTTON_SIZE.SMALL}
                                     onPress={item.action}
-                                    isDisabled={isPendingAddOrDelete || !item.action}
+                                    isDisabled={isPendingDeletion}
                                     innerStyles={selectedButtonInnerStyle}
                                     sentryLabel={CONST.SENTRY_LABEL.AGENTS.EDIT}
                                 >
diff --git a/src/components/Tables/AgentsTable/index.tsx b/src/components/Tables/AgentsTable/index.tsx
index f928690c389e..ae2381ddd6d8 100644
--- a/src/components/Tables/AgentsTable/index.tsx
+++ b/src/components/Tables/AgentsTable/index.tsx
@@ -30,7 +30,7 @@ type AgentRowData = TableData & {
     login: string;
     errors?: OnyxCommon.Errors;
     pendingAction?: OnyxCommon.PendingAction;
-    action?: () => void;
+    action: () => void;
     onChatPress: () => void;
     onCopilotPress: () => void;
     dismissError: () => void;
diff --git a/src/pages/settings/Agents/AgentsPage.tsx b/src/pages/settings/Agents/AgentsPage.tsx
index 10162318dbdc..0ef384f8fa3a 100644
--- a/src/pages/settings/Agents/AgentsPage.tsx
+++ b/src/pages/settings/Agents/AgentsPage.tsx
@@ -86,9 +86,7 @@ function AgentsPage() {
             return [];
         }
         const pendingAction = agentPrompt?.pendingAction;
-        const isPendingAdd = pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD;
         const isPendingDeletion = pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-        const isPendingAddOrDelete = isPendingAdd || isPendingDeletion;
 
         if (!isOffline && isPendingDeletion) {
             return [];
@@ -110,8 +108,8 @@ function AgentsPage() {
                 login: details.login ?? '',
                 pendingAction,
                 errors: Object.keys(rowErrors).length > 0 ? rowErrors : undefined,
-                disabled: isPendingAddOrDelete,
-                action: isPendingAdd ? undefined : () => Navigation.navigate(ROUTES.SETTINGS_AGENTS_EDIT.getRoute(accountID)),
+                disabled: isPendingDeletion,
+                action: () => Navigation.navigate(ROUTES.SETTINGS_AGENTS_EDIT.getRoute(accountID)),
                 onChatPress: () => chatWithAgent(accountID),
                 onCopilotPress: () => switchToDelegator(details.login ?? ''),
                 dismissError: () => handleErrorClose(pendingAction, accountID),
diff --git a/src/pages/settings/Agents/EditAgentPage.tsx b/src/pages/settings/Agents/EditAgentPage.tsx
index c7b197cb82f2..bed5b5f2f1a3 100644
--- a/src/pages/settings/Agents/EditAgentPage.tsx
+++ b/src/pages/settings/Agents/EditAgentPage.tsx
@@ -37,7 +37,9 @@ function EditAgentPage({route}: EditAgentPageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const icons = useMemoizedLazyExpensifyIcons(['Trashcan', 'ChatBubble', 'Users']);
-    const accountID = route.params.accountID;
+    const routeAccountID = route.params.accountID;
+    const [optimisticAgentAccountIDMapping] = useOnyx(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING);
+    const accountID = optimisticAgentAccountIDMapping?.[routeAccountID] ?? routeAccountID;
     const [agent, agentMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`);
     const [personalDetails, personalDetailsMetadata] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: (list) => list?.[accountID]});
     const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
diff --git a/tests/unit/pages/settings/EditAgentPageTest.tsx b/tests/unit/pages/settings/EditAgentPageTest.tsx
index 1a88a1fc0844..eb7bd647aa52 100644
--- a/tests/unit/pages/settings/EditAgentPageTest.tsx
+++ b/tests/unit/pages/settings/EditAgentPageTest.tsx
@@ -146,6 +146,7 @@ jest.mock('@pages/ErrorPage/NotFoundPage', () => {
 const mockUseOnyx = jest.mocked(useOnyx);
 
 const TEST_ACCOUNT_ID = 12345;
+const TEST_REAL_ACCOUNT_ID = 67890;
 
 type EditAgentPageRoute = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.EDIT>['route'];
 type EditAgentPageNavigation = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.EDIT>['navigation'];
@@ -277,4 +278,31 @@ describe('EditAgentPage', () => {
 
         expect(JSON.stringify(toJSON())).not.toContain('notFound.notHere');
     });
+
+    it('renders the real agent data when the route accountID is optimistic', () => {
+        mockUseOnyx.mockImplementation((key, options) => {
+            if (key === ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING) {
+                return [{[TEST_ACCOUNT_ID]: TEST_REAL_ACCOUNT_ID}, {status: 'loaded'}];
+            }
+            if (key === `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_REAL_ACCOUNT_ID}`) {
+                return [{prompt: 'Real prompt'}, {status: 'loaded'}];
+            }
+            if (key === ONYXKEYS.PERSONAL_DETAILS_LIST && options?.selector) {
+                return [{displayName: 'Real Agent', login: 'agent_67890@expensify.ai'}, {status: 'loaded'}];
+            }
+            return [undefined, {status: 'loaded'}];
+        });
+
+        const {toJSON} = render(
+            <EditAgentPage
+                route={mockRoute}
+                navigation={mockNavigation}
+            />,
+        );
+
+        const serialized = JSON.stringify(toJSON());
+        expect(serialized).toContain('Real Agent');
+        expect(serialized).toContain('Real prompt');
+        expect(serialized).not.toContain('notFound.notHere');
+    });
 });

From 94d3e0138301222811403857787561918e390823 Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Thu, 23 Jul 2026 10:16:11 +0430
Subject: [PATCH 03/26] Classify optimistic agent mapping for export

---
 src/libs/ExportOnyxState/common.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libs/ExportOnyxState/common.ts b/src/libs/ExportOnyxState/common.ts
index 55ccde4e2d4c..8001b6909d5d 100644
--- a/src/libs/ExportOnyxState/common.ts
+++ b/src/libs/ExportOnyxState/common.ts
@@ -261,6 +261,7 @@ const safeOnyxKeys = new Set<string>([
     ONYXKEYS.ONBOARDING_POLICY_ID,
     ONYXKEYS.ONBOARDING_PURPOSE_SELECTED,
     ONYXKEYS.ONBOARDING_USER_REPORTED_INTEGRATION,
+    ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING,
     ONYXKEYS.PERSONAL_POLICY_ID,
     ONYXKEYS.PLAID_CURRENT_EVENT,
     ONYXKEYS.POLICY_OWNERSHIP_CHANGE_CHECKS,

From f456a437842d452322fa0f6d6a5bf1e088330d31 Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Thu, 23 Jul 2026 16:52:49 +0430
Subject: [PATCH 04/26] Use RAM-only agent ID mapping

---
 src/ONYXKEYS.ts                                 | 4 ++--
 src/libs/ExportOnyxState/common.ts              | 1 -
 src/pages/settings/Agents/EditAgentPage.tsx     | 6 ++++--
 src/setup/index.ts                              | 1 +
 tests/unit/pages/settings/EditAgentPageTest.tsx | 6 +++---
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index a7d8adfc3542..d9248146ffc8 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -84,7 +84,7 @@ const ONYXKEYS = {
     PERSONAL_DETAILS_LIST: 'personalDetailsList',
 
     /** Maps optimistic agent accountIDs to the real accountIDs returned by CreateAgent */
-    OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING: 'optimisticAgentAccountIDMapping',
+    RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING: 'optimisticAgentAccountIDMapping',
 
     /** Contains all the private personal details of the user */
     PRIVATE_PERSONAL_DETAILS: 'private_personalDetails',
@@ -1526,7 +1526,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.STATUS_DRAFT_CUSTOM_CLEAR_AFTER_DATE]: string;
     [ONYXKEYS.INPUT_FOCUSED]: boolean;
     [ONYXKEYS.PERSONAL_DETAILS_LIST]: OnyxTypes.PersonalDetailsList;
-    [ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING]: Record<string, number>;
+    [ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING]: Record<string, number>;
     [ONYXKEYS.PRIVATE_PERSONAL_DETAILS]: OnyxTypes.PrivatePersonalDetails;
     [ONYXKEYS.PERSONAL_DETAILS_METADATA]: Record<string, OnyxTypes.PersonalDetailsMetadata>;
     [ONYXKEYS.TASK]: OnyxTypes.Task;
diff --git a/src/libs/ExportOnyxState/common.ts b/src/libs/ExportOnyxState/common.ts
index 8001b6909d5d..55ccde4e2d4c 100644
--- a/src/libs/ExportOnyxState/common.ts
+++ b/src/libs/ExportOnyxState/common.ts
@@ -261,7 +261,6 @@ const safeOnyxKeys = new Set<string>([
     ONYXKEYS.ONBOARDING_POLICY_ID,
     ONYXKEYS.ONBOARDING_PURPOSE_SELECTED,
     ONYXKEYS.ONBOARDING_USER_REPORTED_INTEGRATION,
-    ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING,
     ONYXKEYS.PERSONAL_POLICY_ID,
     ONYXKEYS.PLAID_CURRENT_EVENT,
     ONYXKEYS.POLICY_OWNERSHIP_CHANGE_CHECKS,
diff --git a/src/pages/settings/Agents/EditAgentPage.tsx b/src/pages/settings/Agents/EditAgentPage.tsx
index bed5b5f2f1a3..86d7d5337fbb 100644
--- a/src/pages/settings/Agents/EditAgentPage.tsx
+++ b/src/pages/settings/Agents/EditAgentPage.tsx
@@ -38,8 +38,10 @@ function EditAgentPage({route}: EditAgentPageProps) {
     const styles = useThemeStyles();
     const icons = useMemoizedLazyExpensifyIcons(['Trashcan', 'ChatBubble', 'Users']);
     const routeAccountID = route.params.accountID;
-    const [optimisticAgentAccountIDMapping] = useOnyx(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING);
-    const accountID = optimisticAgentAccountIDMapping?.[routeAccountID] ?? routeAccountID;
+    const [resolvedAccountID] = useOnyx(ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, {
+        selector: (mapping: Record<string, number> | null | undefined) => mapping?.[routeAccountID] ?? routeAccountID,
+    });
+    const accountID = resolvedAccountID ?? routeAccountID;
     const [agent, agentMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`);
     const [personalDetails, personalDetailsMetadata] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: (list) => list?.[accountID]});
     const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
diff --git a/src/setup/index.ts b/src/setup/index.ts
index c65d8f014455..b49563bd801c 100644
--- a/src/setup/index.ts
+++ b/src/setup/index.ts
@@ -76,6 +76,7 @@ export default function () {
             ONYXKEYS.COLLECTION.RAM_ONLY_COMPANY_CARDS_LOADING_STATE,
             ONYXKEYS.RAM_ONLY_PLAID_LINK_TOKEN,
             ONYXKEYS.RAM_ONLY_MERGE_HR_LINK_TOKEN,
+            ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING,
             ONYXKEYS.COLLECTION.RAM_ONLY_ISSUE_NEW_EXPENSIFY_CARD,
             ONYXKEYS.RAM_ONLY_DOMAIN_MEMBERS_SELECTED_FOR_MOVE,
             ONYXKEYS.RAM_ONLY_HAS_DISMISSED_CONCIERGE_NOTIFICATION_BANNER,
diff --git a/tests/unit/pages/settings/EditAgentPageTest.tsx b/tests/unit/pages/settings/EditAgentPageTest.tsx
index eb7bd647aa52..22f6b374b624 100644
--- a/tests/unit/pages/settings/EditAgentPageTest.tsx
+++ b/tests/unit/pages/settings/EditAgentPageTest.tsx
@@ -279,10 +279,10 @@ describe('EditAgentPage', () => {
         expect(JSON.stringify(toJSON())).not.toContain('notFound.notHere');
     });
 
-    it('renders the real agent data when the route accountID is optimistic', () => {
+    it('renders the real agent data when the backend maps the optimistic route accountID', () => {
         mockUseOnyx.mockImplementation((key, options) => {
-            if (key === ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING) {
-                return [{[TEST_ACCOUNT_ID]: TEST_REAL_ACCOUNT_ID}, {status: 'loaded'}];
+            if (key === ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING) {
+                return [TEST_REAL_ACCOUNT_ID, {status: 'loaded'}];
             }
             if (key === `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_REAL_ACCOUNT_ID}`) {
                 return [{prompt: 'Real prompt'}, {status: 'loaded'}];

From 7b96d5204f096c4fafc593714785cbc7c1192c44 Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Thu, 23 Jul 2026 17:11:56 +0430
Subject: [PATCH 05/26] classify agent mapping for export

---
 src/libs/ExportOnyxState/common.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libs/ExportOnyxState/common.ts b/src/libs/ExportOnyxState/common.ts
index 55ccde4e2d4c..25a883e90ac8 100644
--- a/src/libs/ExportOnyxState/common.ts
+++ b/src/libs/ExportOnyxState/common.ts
@@ -26,6 +26,7 @@ const onyxKeysToRemove = new Set<ValueOf<typeof ONYXKEYS> | ValueOf<typeof ONYXK
     ONYXKEYS.NVP_PRIVATE_BILLING_STATUS,
     ONYXKEYS.RAM_ONLY_PLAID_LINK_TOKEN,
     ONYXKEYS.RAM_ONLY_MERGE_HR_LINK_TOKEN,
+    ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING,
     ONYXKEYS.ONFIDO_TOKEN,
     ONYXKEYS.ONFIDO_APPLICANT_ID,
     // maskFragileData won't catch this one, since the secret sits in a field named "token"

From e5dcc930341a1c77dcd3318edf0514e285a031d8 Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Thu, 23 Jul 2026 17:29:46 +0430
Subject: [PATCH 06/26] test: Cover agent mapping fallback

---
 .../unit/pages/settings/EditAgentPageTest.tsx | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/tests/unit/pages/settings/EditAgentPageTest.tsx b/tests/unit/pages/settings/EditAgentPageTest.tsx
index 22f6b374b624..dc9dfb1b0bbb 100644
--- a/tests/unit/pages/settings/EditAgentPageTest.tsx
+++ b/tests/unit/pages/settings/EditAgentPageTest.tsx
@@ -279,6 +279,33 @@ describe('EditAgentPage', () => {
         expect(JSON.stringify(toJSON())).not.toContain('notFound.notHere');
     });
 
+    it('renders the route agent data when no optimistic accountID mapping exists', () => {
+        mockUseOnyx.mockImplementation((key, options) => {
+            if (key === ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING) {
+                return [undefined, {status: 'loaded'}];
+            }
+            if (key === `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`) {
+                return [{prompt: 'Route prompt'}, {status: 'loaded'}];
+            }
+            if (key === ONYXKEYS.PERSONAL_DETAILS_LIST && options?.selector) {
+                return [{displayName: 'Route Agent', login: 'agent_12345@expensify.ai'}, {status: 'loaded'}];
+            }
+            return [undefined, {status: 'loaded'}];
+        });
+
+        const {toJSON} = render(
+            <EditAgentPage
+                route={mockRoute}
+                navigation={mockNavigation}
+            />,
+        );
+
+        const serialized = JSON.stringify(toJSON());
+        expect(serialized).toContain('Route Agent');
+        expect(serialized).toContain('Route prompt');
+        expect(serialized).not.toContain('notFound.notHere');
+    });
+
     it('renders the real agent data when the backend maps the optimistic route accountID', () => {
         mockUseOnyx.mockImplementation((key, options) => {
             if (key === ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING) {

From 7fb2d599e31122498f1d21c99d9d4eb51f5b73ee Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Thu, 23 Jul 2026 17:41:16 +0430
Subject: [PATCH 07/26] test: Cover agent mapping selector

---
 tests/unit/pages/settings/EditAgentPageTest.tsx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/unit/pages/settings/EditAgentPageTest.tsx b/tests/unit/pages/settings/EditAgentPageTest.tsx
index dc9dfb1b0bbb..09bafc630dd8 100644
--- a/tests/unit/pages/settings/EditAgentPageTest.tsx
+++ b/tests/unit/pages/settings/EditAgentPageTest.tsx
@@ -153,6 +153,10 @@ type EditAgentPageNavigation = PlatformStackScreenProps<SettingsNavigatorParamLi
 
 const mockRoute = {params: {accountID: TEST_ACCOUNT_ID}} as EditAgentPageRoute;
 const mockNavigation = {} as EditAgentPageNavigation;
+const getSelectedAccountID = (options: Parameters<typeof useOnyx>[1], mapping: Record<string, number> | undefined, fallbackAccountID: number) => {
+    options?.selector?.(mapping);
+    return mapping?.[fallbackAccountID] ?? fallbackAccountID;
+};
 
 describe('EditAgentPage', () => {
     beforeEach(() => {
@@ -281,8 +285,8 @@ describe('EditAgentPage', () => {
 
     it('renders the route agent data when no optimistic accountID mapping exists', () => {
         mockUseOnyx.mockImplementation((key, options) => {
-            if (key === ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING) {
-                return [undefined, {status: 'loaded'}];
+            if (key === ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING && options?.selector) {
+                return [getSelectedAccountID(options, undefined, TEST_ACCOUNT_ID), {status: 'loaded'}];
             }
             if (key === `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`) {
                 return [{prompt: 'Route prompt'}, {status: 'loaded'}];
@@ -308,8 +312,8 @@ describe('EditAgentPage', () => {
 
     it('renders the real agent data when the backend maps the optimistic route accountID', () => {
         mockUseOnyx.mockImplementation((key, options) => {
-            if (key === ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING) {
-                return [TEST_REAL_ACCOUNT_ID, {status: 'loaded'}];
+            if (key === ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING && options?.selector) {
+                return [getSelectedAccountID(options, {[TEST_ACCOUNT_ID]: TEST_REAL_ACCOUNT_ID}, TEST_ACCOUNT_ID), {status: 'loaded'}];
             }
             if (key === `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_REAL_ACCOUNT_ID}`) {
                 return [{prompt: 'Real prompt'}, {status: 'loaded'}];

From f598f4f31cf76d412bea0f22ebd1a3f8cff8d2e3 Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Fri, 31 Jul 2026 14:30:18 +0430
Subject: [PATCH 08/26] Fix optimistic agent route param

---
 src/pages/settings/Agents/EditAgentPage.tsx   | 13 ++++++-
 .../unit/pages/settings/EditAgentPageTest.tsx | 39 +++++++++++++++++--
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/pages/settings/Agents/EditAgentPage.tsx b/src/pages/settings/Agents/EditAgentPage.tsx
index 14cccd98f42b..abca824327e7 100644
--- a/src/pages/settings/Agents/EditAgentPage.tsx
+++ b/src/pages/settings/Agents/EditAgentPage.tsx
@@ -29,8 +29,9 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 
+import {useIsFocused} from '@react-navigation/native';
 import {Str} from 'expensify-common';
-import React from 'react';
+import React, {useEffect} from 'react';
 import {View} from 'react-native';
 
 type EditAgentPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.EDIT>;
@@ -39,11 +40,21 @@ function EditAgentPage({route}: EditAgentPageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const icons = useMemoizedLazyExpensifyIcons(['Trashcan', 'ChatBubble', 'Users']);
+    const isFocused = useIsFocused();
     const routeAccountID = route.params.accountID;
     const [resolvedAccountID] = useOnyx(ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, {
         selector: (mapping: Record<string, number> | null | undefined) => mapping?.[routeAccountID] ?? routeAccountID,
     });
     const accountID = resolvedAccountID ?? routeAccountID;
+
+    useEffect(() => {
+        if (!isFocused || accountID === routeAccountID) {
+            return;
+        }
+
+        Navigation.setParams({accountID}, route.key);
+    }, [accountID, isFocused, route.key, routeAccountID]);
+
     const [agent, agentMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`);
     const [personalDetails, personalDetailsMetadata] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: (list) => list?.[accountID]});
     const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
diff --git a/tests/unit/pages/settings/EditAgentPageTest.tsx b/tests/unit/pages/settings/EditAgentPageTest.tsx
index 09bafc630dd8..b592d53b840a 100644
--- a/tests/unit/pages/settings/EditAgentPageTest.tsx
+++ b/tests/unit/pages/settings/EditAgentPageTest.tsx
@@ -2,6 +2,7 @@ import {render} from '@testing-library/react-native';
 
 import useOnyx from '@hooks/useOnyx';
 
+import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 
@@ -10,6 +11,7 @@ import EditAgentPage from '@pages/settings/Agents/EditAgentPage';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
 
+import {useIsFocused} from '@react-navigation/native';
 import React from 'react';
 
 jest.mock('@userActions/Agent', () => ({
@@ -62,6 +64,7 @@ jest.mock('@hooks/useOnyx', () => jest.fn(() => [undefined, {status: 'loaded'}])
 jest.mock('@libs/Navigation/Navigation', () => ({
     goBack: jest.fn(),
     navigate: jest.fn(),
+    setParams: jest.fn(),
 }));
 
 jest.mock('@react-navigation/native', () => {
@@ -70,7 +73,7 @@ jest.mock('@react-navigation/native', () => {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return {
         ...actual,
-        useIsFocused: () => true,
+        useIsFocused: jest.fn(() => true),
         useRoute: jest.fn(() => ({name: '', key: '', params: {}})),
     };
 });
@@ -144,6 +147,8 @@ jest.mock('@pages/ErrorPage/NotFoundPage', () => {
 });
 
 const mockUseOnyx = jest.mocked(useOnyx);
+const mockSetParams = jest.mocked(Navigation.setParams);
+const mockUseIsFocused = jest.mocked(useIsFocused);
 
 const TEST_ACCOUNT_ID = 12345;
 const TEST_REAL_ACCOUNT_ID = 67890;
@@ -151,7 +156,7 @@ const TEST_REAL_ACCOUNT_ID = 67890;
 type EditAgentPageRoute = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.EDIT>['route'];
 type EditAgentPageNavigation = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.EDIT>['navigation'];
 
-const mockRoute = {params: {accountID: TEST_ACCOUNT_ID}} as EditAgentPageRoute;
+const mockRoute = {key: 'Settings_Agents_Edit-test', params: {accountID: TEST_ACCOUNT_ID}} as EditAgentPageRoute;
 const mockNavigation = {} as EditAgentPageNavigation;
 const getSelectedAccountID = (options: Parameters<typeof useOnyx>[1], mapping: Record<string, number> | undefined, fallbackAccountID: number) => {
     options?.selector?.(mapping);
@@ -161,6 +166,7 @@ const getSelectedAccountID = (options: Parameters<typeof useOnyx>[1], mapping: R
 describe('EditAgentPage', () => {
     beforeEach(() => {
         jest.clearAllMocks();
+        mockUseIsFocused.mockReturnValue(true);
         mockUseOnyx.mockImplementation((key, options) => {
             if (key === ONYXKEYS.PERSONAL_DETAILS_LIST && options?.selector) {
                 return [{displayName: 'Default Agent'}, {status: 'loaded'}];
@@ -308,9 +314,10 @@ describe('EditAgentPage', () => {
         expect(serialized).toContain('Route Agent');
         expect(serialized).toContain('Route prompt');
         expect(serialized).not.toContain('notFound.notHere');
+        expect(mockSetParams).not.toHaveBeenCalled();
     });
 
-    it('renders the real agent data when the backend maps the optimistic route accountID', () => {
+    it('renders the real agent data and updates the route param when the backend maps the optimistic route accountID', () => {
         mockUseOnyx.mockImplementation((key, options) => {
             if (key === ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING && options?.selector) {
                 return [getSelectedAccountID(options, {[TEST_ACCOUNT_ID]: TEST_REAL_ACCOUNT_ID}, TEST_ACCOUNT_ID), {status: 'loaded'}];
@@ -335,5 +342,31 @@ describe('EditAgentPage', () => {
         expect(serialized).toContain('Real Agent');
         expect(serialized).toContain('Real prompt');
         expect(serialized).not.toContain('notFound.notHere');
+        expect(mockSetParams).toHaveBeenCalledWith({accountID: TEST_REAL_ACCOUNT_ID}, mockRoute.key);
+    });
+
+    it('does not update the optimistic edit route while the edit page is not focused', () => {
+        mockUseIsFocused.mockReturnValue(false);
+        mockUseOnyx.mockImplementation((key, options) => {
+            if (key === ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING && options?.selector) {
+                return [getSelectedAccountID(options, {[TEST_ACCOUNT_ID]: TEST_REAL_ACCOUNT_ID}, TEST_ACCOUNT_ID), {status: 'loaded'}];
+            }
+            if (key === `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_REAL_ACCOUNT_ID}`) {
+                return [{prompt: 'Real prompt'}, {status: 'loaded'}];
+            }
+            if (key === ONYXKEYS.PERSONAL_DETAILS_LIST && options?.selector) {
+                return [{displayName: 'Real Agent', login: 'agent_67890@expensify.ai'}, {status: 'loaded'}];
+            }
+            return [undefined, {status: 'loaded'}];
+        });
+
+        render(
+            <EditAgentPage
+                route={mockRoute}
+                navigation={mockNavigation}
+            />,
+        );
+
+        expect(mockSetParams).not.toHaveBeenCalled();
     });
 });

From 2ecdbbf23c67ffc29687118409413d4ec2874c3f Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Tue, 4 Aug 2026 15:27:10 +0430
Subject: [PATCH 09/26] Refine agent ID mapping selector

---
 src/ONYXKEYS.ts                                |  2 +-
 src/pages/settings/Agents/EditAgentPage.tsx    |  3 ++-
 .../onyx/OptimisticAgentAccountIDMapping.ts    |  4 ++++
 src/types/onyx/index.ts                        |  2 ++
 .../unit/pages/settings/EditAgentPageTest.tsx  | 18 ++++++++++++------
 5 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 src/types/onyx/OptimisticAgentAccountIDMapping.ts

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 472da98b5536..d7385551efa0 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -1564,7 +1564,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.STATUS_DRAFT_CUSTOM_CLEAR_AFTER_DATE]: string;
     [ONYXKEYS.INPUT_FOCUSED]: boolean;
     [ONYXKEYS.PERSONAL_DETAILS_LIST]: OnyxTypes.PersonalDetailsList;
-    [ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING]: Record<string, number>;
+    [ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING]: OnyxTypes.OptimisticAgentAccountIDMapping;
     [ONYXKEYS.PRIVATE_PERSONAL_DETAILS]: OnyxTypes.PrivatePersonalDetails;
     [ONYXKEYS.PERSONAL_DETAILS_METADATA]: Record<string, OnyxTypes.PersonalDetailsMetadata>;
     [ONYXKEYS.TASK]: OnyxTypes.Task;
diff --git a/src/pages/settings/Agents/EditAgentPage.tsx b/src/pages/settings/Agents/EditAgentPage.tsx
index abca824327e7..4dd16335e5c4 100644
--- a/src/pages/settings/Agents/EditAgentPage.tsx
+++ b/src/pages/settings/Agents/EditAgentPage.tsx
@@ -28,6 +28,7 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
+import type {OptimisticAgentAccountIDMapping} from '@src/types/onyx';
 
 import {useIsFocused} from '@react-navigation/native';
 import {Str} from 'expensify-common';
@@ -43,7 +44,7 @@ function EditAgentPage({route}: EditAgentPageProps) {
     const isFocused = useIsFocused();
     const routeAccountID = route.params.accountID;
     const [resolvedAccountID] = useOnyx(ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, {
-        selector: (mapping: Record<string, number> | null | undefined) => mapping?.[routeAccountID] ?? routeAccountID,
+        selector: (mapping: OptimisticAgentAccountIDMapping | null | undefined) => mapping?.[routeAccountID],
     });
     const accountID = resolvedAccountID ?? routeAccountID;
 
diff --git a/src/types/onyx/OptimisticAgentAccountIDMapping.ts b/src/types/onyx/OptimisticAgentAccountIDMapping.ts
new file mode 100644
index 000000000000..586467639478
--- /dev/null
+++ b/src/types/onyx/OptimisticAgentAccountIDMapping.ts
@@ -0,0 +1,4 @@
+/** Maps optimistic agent accountIDs to the real accountIDs returned by CreateAgent */
+type OptimisticAgentAccountIDMapping = Record<string, number>;
+
+export default OptimisticAgentAccountIDMapping;
diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts
index bd61f50897aa..298baa49f651 100644
--- a/src/types/onyx/index.ts
+++ b/src/types/onyx/index.ts
@@ -116,6 +116,7 @@ import type Onboarding from './Onboarding';
 import type OnboardingRHPVariant from './OnboardingRHPVariant';
 import type OnyxInputOrEntry from './OnyxInputOrEntry';
 import type {AnyOnyxUpdatesFromServer, OnyxUpdateEvent, OnyxUpdatesFromServer} from './OnyxUpdatesFromServer';
+import type OptimisticAgentAccountIDMapping from './OptimisticAgentAccountIDMapping';
 import type {DecisionName, OriginalMessageIOU} from './OriginalMessage';
 import type Pages from './Pages';
 import type PendingConciergeResponse from './PendingConciergeResponse';
@@ -280,6 +281,7 @@ export type {
     Modal,
     Network,
     OnyxInputOrEntry,
+    OptimisticAgentAccountIDMapping,
     OnyxUpdateEvent,
     OnyxUpdatesFromServer,
     AnyOnyxUpdatesFromServer,
diff --git a/tests/unit/pages/settings/EditAgentPageTest.tsx b/tests/unit/pages/settings/EditAgentPageTest.tsx
index b592d53b840a..9c8ce6c27465 100644
--- a/tests/unit/pages/settings/EditAgentPageTest.tsx
+++ b/tests/unit/pages/settings/EditAgentPageTest.tsx
@@ -10,6 +10,7 @@ import EditAgentPage from '@pages/settings/Agents/EditAgentPage';
 
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
+import type {OptimisticAgentAccountIDMapping} from '@src/types/onyx';
 
 import {useIsFocused} from '@react-navigation/native';
 import React from 'react';
@@ -158,9 +159,8 @@ type EditAgentPageNavigation = PlatformStackScreenProps<SettingsNavigatorParamLi
 
 const mockRoute = {key: 'Settings_Agents_Edit-test', params: {accountID: TEST_ACCOUNT_ID}} as EditAgentPageRoute;
 const mockNavigation = {} as EditAgentPageNavigation;
-const getSelectedAccountID = (options: Parameters<typeof useOnyx>[1], mapping: Record<string, number> | undefined, fallbackAccountID: number) => {
-    options?.selector?.(mapping);
-    return mapping?.[fallbackAccountID] ?? fallbackAccountID;
+const getSelectedAccountID = (options: Parameters<typeof useOnyx>[1], mapping: OptimisticAgentAccountIDMapping | undefined): number | undefined => {
+    return options?.selector?.(mapping) as number | undefined;
 };
 
 describe('EditAgentPage', () => {
@@ -292,7 +292,9 @@ describe('EditAgentPage', () => {
     it('renders the route agent data when no optimistic accountID mapping exists', () => {
         mockUseOnyx.mockImplementation((key, options) => {
             if (key === ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING && options?.selector) {
-                return [getSelectedAccountID(options, undefined, TEST_ACCOUNT_ID), {status: 'loaded'}];
+                const selectedAccountID = getSelectedAccountID(options, undefined);
+                expect(selectedAccountID).toBeUndefined();
+                return [selectedAccountID, {status: 'loaded'}];
             }
             if (key === `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`) {
                 return [{prompt: 'Route prompt'}, {status: 'loaded'}];
@@ -320,7 +322,9 @@ describe('EditAgentPage', () => {
     it('renders the real agent data and updates the route param when the backend maps the optimistic route accountID', () => {
         mockUseOnyx.mockImplementation((key, options) => {
             if (key === ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING && options?.selector) {
-                return [getSelectedAccountID(options, {[TEST_ACCOUNT_ID]: TEST_REAL_ACCOUNT_ID}, TEST_ACCOUNT_ID), {status: 'loaded'}];
+                const selectedAccountID = getSelectedAccountID(options, {[TEST_ACCOUNT_ID]: TEST_REAL_ACCOUNT_ID});
+                expect(selectedAccountID).toBe(TEST_REAL_ACCOUNT_ID);
+                return [selectedAccountID, {status: 'loaded'}];
             }
             if (key === `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_REAL_ACCOUNT_ID}`) {
                 return [{prompt: 'Real prompt'}, {status: 'loaded'}];
@@ -349,7 +353,9 @@ describe('EditAgentPage', () => {
         mockUseIsFocused.mockReturnValue(false);
         mockUseOnyx.mockImplementation((key, options) => {
             if (key === ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING && options?.selector) {
-                return [getSelectedAccountID(options, {[TEST_ACCOUNT_ID]: TEST_REAL_ACCOUNT_ID}, TEST_ACCOUNT_ID), {status: 'loaded'}];
+                const selectedAccountID = getSelectedAccountID(options, {[TEST_ACCOUNT_ID]: TEST_REAL_ACCOUNT_ID});
+                expect(selectedAccountID).toBe(TEST_REAL_ACCOUNT_ID);
+                return [selectedAccountID, {status: 'loaded'}];
             }
             if (key === `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_REAL_ACCOUNT_ID}`) {
                 return [{prompt: 'Real prompt'}, {status: 'loaded'}];

From a5c0e4a10492544afca6bc6828d791b4912638f2 Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Tue, 4 Aug 2026 16:12:16 +0430
Subject: [PATCH 10/26] Refine agent ID mapping selector

---
 tests/unit/pages/settings/EditAgentPageTest.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/unit/pages/settings/EditAgentPageTest.tsx b/tests/unit/pages/settings/EditAgentPageTest.tsx
index 9c8ce6c27465..839b8945b0f4 100644
--- a/tests/unit/pages/settings/EditAgentPageTest.tsx
+++ b/tests/unit/pages/settings/EditAgentPageTest.tsx
@@ -160,7 +160,8 @@ type EditAgentPageNavigation = PlatformStackScreenProps<SettingsNavigatorParamLi
 const mockRoute = {key: 'Settings_Agents_Edit-test', params: {accountID: TEST_ACCOUNT_ID}} as EditAgentPageRoute;
 const mockNavigation = {} as EditAgentPageNavigation;
 const getSelectedAccountID = (options: Parameters<typeof useOnyx>[1], mapping: OptimisticAgentAccountIDMapping | undefined): number | undefined => {
-    return options?.selector?.(mapping) as number | undefined;
+    const selectedAccountID = options?.selector?.(mapping);
+    return typeof selectedAccountID === 'number' ? selectedAccountID : undefined;
 };
 
 describe('EditAgentPage', () => {

From f882573477f97baff9eee9b09c58a986a80945aa Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Tue, 4 Aug 2026 16:23:48 +0430
Subject: [PATCH 11/26] Target agent route param update

---
 src/pages/settings/Agents/EditAgentPage.tsx     | 7 ++++---
 tests/unit/pages/settings/EditAgentPageTest.tsx | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/pages/settings/Agents/EditAgentPage.tsx b/src/pages/settings/Agents/EditAgentPage.tsx
index 4dd16335e5c4..3752357fddce 100644
--- a/src/pages/settings/Agents/EditAgentPage.tsx
+++ b/src/pages/settings/Agents/EditAgentPage.tsx
@@ -37,11 +37,12 @@ import {View} from 'react-native';
 
 type EditAgentPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.EDIT>;
 
-function EditAgentPage({route}: EditAgentPageProps) {
+function EditAgentPage({route, navigation}: EditAgentPageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const icons = useMemoizedLazyExpensifyIcons(['Trashcan', 'ChatBubble', 'Users']);
     const isFocused = useIsFocused();
+    const navigatorKey = navigation.getState()?.key;
     const routeAccountID = route.params.accountID;
     const [resolvedAccountID] = useOnyx(ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, {
         selector: (mapping: OptimisticAgentAccountIDMapping | null | undefined) => mapping?.[routeAccountID],
@@ -53,8 +54,8 @@ function EditAgentPage({route}: EditAgentPageProps) {
             return;
         }
 
-        Navigation.setParams({accountID}, route.key);
-    }, [accountID, isFocused, route.key, routeAccountID]);
+        Navigation.setParams({accountID}, route.key, navigatorKey);
+    }, [accountID, isFocused, navigatorKey, route.key, routeAccountID]);
 
     const [agent, agentMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`);
     const [personalDetails, personalDetailsMetadata] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: (list) => list?.[accountID]});
diff --git a/tests/unit/pages/settings/EditAgentPageTest.tsx b/tests/unit/pages/settings/EditAgentPageTest.tsx
index 839b8945b0f4..7ead07b955cd 100644
--- a/tests/unit/pages/settings/EditAgentPageTest.tsx
+++ b/tests/unit/pages/settings/EditAgentPageTest.tsx
@@ -153,12 +153,13 @@ const mockUseIsFocused = jest.mocked(useIsFocused);
 
 const TEST_ACCOUNT_ID = 12345;
 const TEST_REAL_ACCOUNT_ID = 67890;
+const TEST_NAVIGATOR_KEY = 'SettingsSplitNavigator-test';
 
 type EditAgentPageRoute = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.EDIT>['route'];
 type EditAgentPageNavigation = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.EDIT>['navigation'];
 
 const mockRoute = {key: 'Settings_Agents_Edit-test', params: {accountID: TEST_ACCOUNT_ID}} as EditAgentPageRoute;
-const mockNavigation = {} as EditAgentPageNavigation;
+const mockNavigation = {getState: () => ({key: TEST_NAVIGATOR_KEY})} as EditAgentPageNavigation;
 const getSelectedAccountID = (options: Parameters<typeof useOnyx>[1], mapping: OptimisticAgentAccountIDMapping | undefined): number | undefined => {
     const selectedAccountID = options?.selector?.(mapping);
     return typeof selectedAccountID === 'number' ? selectedAccountID : undefined;
@@ -347,7 +348,7 @@ describe('EditAgentPage', () => {
         expect(serialized).toContain('Real Agent');
         expect(serialized).toContain('Real prompt');
         expect(serialized).not.toContain('notFound.notHere');
-        expect(mockSetParams).toHaveBeenCalledWith({accountID: TEST_REAL_ACCOUNT_ID}, mockRoute.key);
+        expect(mockSetParams).toHaveBeenCalledWith({accountID: TEST_REAL_ACCOUNT_ID}, mockRoute.key, TEST_NAVIGATOR_KEY);
     });
 
     it('does not update the optimistic edit route while the edit page is not focused', () => {

From 2268ca204d131c2f32b606bee83a2c37955ec7ad Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Fri, 14 Aug 2026 11:16:55 +0430
Subject: [PATCH 12/26] Fix agent edit navigation for optimistic accountIDs

---
 src/ONYXKEYS.ts                               |   2 +-
 src/SplashScreenStateContext.tsx              |   1 +
 src/libs/Navigation/Navigation.ts             |  27 +++++
 .../reconcileOptimisticAgentAccountID.ts      |  47 ++++++++
 src/pages/settings/Agents/EditAgentPage.tsx   |  23 +---
 .../onyx/OptimisticAgentAccountIDMapping.ts   |   5 +-
 src/types/onyx/index.ts                       |   2 +-
 .../unit/pages/settings/EditAgentPageTest.tsx | 106 +-----------------
 8 files changed, 87 insertions(+), 126 deletions(-)
 create mode 100644 src/libs/actions/reconcileOptimisticAgentAccountID.ts

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 42153783aef7..a3fde26465b1 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -87,7 +87,7 @@ const ONYXKEYS = {
     /** Contains all the personalDetails the user has access to, keyed by accountID */
     PERSONAL_DETAILS_LIST: 'personalDetailsList',
 
-    /** Maps optimistic agent accountIDs to the real accountIDs returned by CreateAgent */
+    /** Maps an agent's optimistic accountID to the real accountID CreateAgent assigns, so in-flight navigation can resolve to the real agent */
     RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING: 'optimisticAgentAccountIDMapping',
 
     /** Contains all the private personal details of the user */
diff --git a/src/SplashScreenStateContext.tsx b/src/SplashScreenStateContext.tsx
index f0f1a6d305d7..c3131c72d0fa 100644
--- a/src/SplashScreenStateContext.tsx
+++ b/src/SplashScreenStateContext.tsx
@@ -29,6 +29,7 @@ const SplashScreenActionsContext = React.createContext<SplashScreenActionsContex
 
 function loadPostSplashScreenModules() {
     import('./libs/actions/replaceOptimisticReportWithActualReport');
+    import('./libs/actions/reconcileOptimisticAgentAccountID');
     import('./libs/registerPaginationConfig');
     loadUnreadIndicatorUpdater();
 }
diff --git a/src/libs/Navigation/Navigation.ts b/src/libs/Navigation/Navigation.ts
index 2ba05fcf51a2..9b92332d6b61 100644
--- a/src/libs/Navigation/Navigation.ts
+++ b/src/libs/Navigation/Navigation.ts
@@ -830,6 +830,32 @@ function getReportRouteByID(reportID?: string, routes: NavigationRoute[] = navig
     return null;
 }
 
+const AGENT_ACCOUNT_ID_SCREEN_NAMES = new Set<string>([
+    SCREENS.SETTINGS.AGENTS.EDIT,
+    SCREENS.SETTINGS.AGENTS.EDIT_NAME,
+    SCREENS.SETTINGS.AGENTS.EDIT_PROMPT,
+    SCREENS.SETTINGS.AGENTS.EDIT_AVATAR,
+]);
+
+/**
+ * Finds every currently mounted agent screen (edit, edit name/prompt/avatar) whose `accountID` param matches the given
+ * value, anywhere in the navigation tree (not just the focused route) - a stacked-but-backgrounded screen (e.g. the
+ * Edit page behind Edit Name) needs its param fixed too, or it shows "Hmm... it's not here" once it regains focus.
+ * Returns each match with the key of the navigator that directly owns it, for use as `setParams`'s `targetKey`.
+ */
+function getAgentAccountIDRoutes(accountID: number, routes: NavigationRoute[] = navigationRef.getRootState().routes, targetKey?: string): Array<{routeKey: string; targetKey?: string}> {
+    const matches: Array<{routeKey: string; targetKey?: string}> = [];
+    for (const route of routes) {
+        if (!!route.key && AGENT_ACCOUNT_ID_SCREEN_NAMES.has(route.name) && !!route.params && 'accountID' in route.params && Number(route.params.accountID) === accountID) {
+            matches.push({routeKey: route.key, targetKey});
+        }
+        if (route.state?.routes) {
+            matches.push(...getAgentAccountIDRoutes(accountID, route.state.routes, route.state.key));
+        }
+    }
+    return matches;
+}
+
 function getTopmostSuperWideRHPReportParams(
     state: NavigationState = navigationRef.getRootState(),
 ): RightModalNavigatorParamList[typeof SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT] | RightModalNavigatorParamList[typeof SCREENS.RIGHT_MODAL.EXPENSE_REPORT] | undefined {
@@ -1299,6 +1325,7 @@ export default {
     removeScreenByKey,
     removeReportScreen,
     getReportRouteByID,
+    getAgentAccountIDRoutes,
     replaceWithSplitNavigator,
     isTopmostRouteModalScreen,
     isOnboardingFlow,
diff --git a/src/libs/actions/reconcileOptimisticAgentAccountID.ts b/src/libs/actions/reconcileOptimisticAgentAccountID.ts
new file mode 100644
index 000000000000..64acda32f173
--- /dev/null
+++ b/src/libs/actions/reconcileOptimisticAgentAccountID.ts
@@ -0,0 +1,47 @@
+import Navigation from '@libs/Navigation/Navigation';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {OptimisticAgentAccountIDMapping} from '@src/types/onyx';
+
+import Onyx from 'react-native-onyx';
+
+/**
+ * reconcileOptimisticAgentAccountID
+ *
+ * THE PROBLEM:
+ * Creating an agent writes it to Onyx under a temporary, client-generated accountID so the Agents list can show it
+ * immediately (offline-first UX). If an agent screen (Edit, Edit Name, Edit Prompt, Edit Avatar - reachable from the
+ * Agents list or from the agent's own Profile page) is opened before CreateAgent resolves, it mounts with that
+ * optimistic accountID in its route params.
+ *
+ * THE SOLUTION:
+ * Once the server assigns the real accountID, CreateAgent's response merges
+ * {[optimisticAccountID]: realAccountID} into RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING (the real agent data is
+ * already written under the real accountID by that same response - only the route params need fixing). This module
+ * is the single place that reacts to the mapping: it walks the whole navigation tree for every agent screen still
+ * parameterized by the optimistic accountID - not just the focused one, since a screen can be stacked behind another
+ * - and swaps in the real accountID, so those screens keep working instead of falling into "Hmm... it's not here" or
+ * submitting a write against an accountID the backend no longer recognizes.
+ */
+Onyx.connectWithoutView({
+    key: ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING,
+    callback: (mapping: OptimisticAgentAccountIDMapping | undefined) => {
+        if (!mapping) {
+            return;
+        }
+
+        for (const [optimisticAccountIDKey, realAccountID] of Object.entries(mapping)) {
+            const optimisticAccountID = Number(optimisticAccountIDKey);
+            const routes = Navigation.getAgentAccountIDRoutes(optimisticAccountID);
+            for (const route of routes) {
+                Navigation.setParams({accountID: realAccountID}, route.routeKey, route.targetKey);
+            }
+
+            // The mapping only exists to bridge an already-open optimistic route; once swept, drop the entry so this
+            // RAM-only map doesn't grow by one dead entry per agent created for the rest of the session.
+            Onyx.merge(ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, {[optimisticAccountIDKey]: null});
+        }
+    },
+});
+
+export default {};
diff --git a/src/pages/settings/Agents/EditAgentPage.tsx b/src/pages/settings/Agents/EditAgentPage.tsx
index 10ee253d123a..09343a22996e 100644
--- a/src/pages/settings/Agents/EditAgentPage.tsx
+++ b/src/pages/settings/Agents/EditAgentPage.tsx
@@ -29,35 +29,18 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import type {OptimisticAgentAccountIDMapping} from '@src/types/onyx';
 
-import {useIsFocused} from '@react-navigation/native';
 import {Str} from 'expensify-common';
-import React, {useEffect} from 'react';
+import React from 'react';
 import {View} from 'react-native';
 
 type EditAgentPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.EDIT>;
 
-function EditAgentPage({route, navigation}: EditAgentPageProps) {
+function EditAgentPage({route}: EditAgentPageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const icons = useMemoizedLazyExpensifyIcons(['Trashcan', 'ChatBubble', 'Users']);
-    const isFocused = useIsFocused();
-    const navigatorKey = navigation.getState()?.key;
-    const routeAccountID = route.params.accountID;
-    const [resolvedAccountID] = useOnyx(ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, {
-        selector: (mapping: OptimisticAgentAccountIDMapping | null | undefined) => mapping?.[routeAccountID],
-    });
-    const accountID = resolvedAccountID ?? routeAccountID;
-
-    useEffect(() => {
-        if (!isFocused || accountID === routeAccountID) {
-            return;
-        }
-
-        Navigation.setParams({accountID}, route.key, navigatorKey);
-    }, [accountID, isFocused, navigatorKey, route.key, routeAccountID]);
-
+    const accountID = route.params.accountID;
     const [agent, agentMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`);
     const [personalDetails, personalDetailsMetadata] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: (list) => list?.[accountID]});
     const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
diff --git a/src/types/onyx/OptimisticAgentAccountIDMapping.ts b/src/types/onyx/OptimisticAgentAccountIDMapping.ts
index 586467639478..15db7c71dd1f 100644
--- a/src/types/onyx/OptimisticAgentAccountIDMapping.ts
+++ b/src/types/onyx/OptimisticAgentAccountIDMapping.ts
@@ -1,4 +1,7 @@
-/** Maps optimistic agent accountIDs to the real accountIDs returned by CreateAgent */
+/**
+ * Maps an agent's optimistic (client-generated) accountID to the real accountID the backend assigns once CreateAgent resolves.
+ * Backend-populated via CreateAgent's onyxData; RAM-only because an optimistic accountID is meaningless after a reload.
+ */
 type OptimisticAgentAccountIDMapping = Record<string, number>;
 
 export default OptimisticAgentAccountIDMapping;
diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts
index dcc80b716582..ad6db71ffd93 100644
--- a/src/types/onyx/index.ts
+++ b/src/types/onyx/index.ts
@@ -280,10 +280,10 @@ export type {
     Modal,
     Network,
     OnyxInputOrEntry,
-    OptimisticAgentAccountIDMapping,
     OnyxUpdateEvent,
     OnyxUpdatesFromServer,
     AnyOnyxUpdatesFromServer,
+    OptimisticAgentAccountIDMapping,
     OdometerDraft,
     Pages,
     ConciergePendingFollowupList,
diff --git a/tests/unit/pages/settings/EditAgentPageTest.tsx b/tests/unit/pages/settings/EditAgentPageTest.tsx
index 7ead07b955cd..1a88a1fc0844 100644
--- a/tests/unit/pages/settings/EditAgentPageTest.tsx
+++ b/tests/unit/pages/settings/EditAgentPageTest.tsx
@@ -2,7 +2,6 @@ import {render} from '@testing-library/react-native';
 
 import useOnyx from '@hooks/useOnyx';
 
-import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 
@@ -10,9 +9,7 @@ import EditAgentPage from '@pages/settings/Agents/EditAgentPage';
 
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
-import type {OptimisticAgentAccountIDMapping} from '@src/types/onyx';
 
-import {useIsFocused} from '@react-navigation/native';
 import React from 'react';
 
 jest.mock('@userActions/Agent', () => ({
@@ -65,7 +62,6 @@ jest.mock('@hooks/useOnyx', () => jest.fn(() => [undefined, {status: 'loaded'}])
 jest.mock('@libs/Navigation/Navigation', () => ({
     goBack: jest.fn(),
     navigate: jest.fn(),
-    setParams: jest.fn(),
 }));
 
 jest.mock('@react-navigation/native', () => {
@@ -74,7 +70,7 @@ jest.mock('@react-navigation/native', () => {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return {
         ...actual,
-        useIsFocused: jest.fn(() => true),
+        useIsFocused: () => true,
         useRoute: jest.fn(() => ({name: '', key: '', params: {}})),
     };
 });
@@ -148,27 +144,18 @@ jest.mock('@pages/ErrorPage/NotFoundPage', () => {
 });
 
 const mockUseOnyx = jest.mocked(useOnyx);
-const mockSetParams = jest.mocked(Navigation.setParams);
-const mockUseIsFocused = jest.mocked(useIsFocused);
 
 const TEST_ACCOUNT_ID = 12345;
-const TEST_REAL_ACCOUNT_ID = 67890;
-const TEST_NAVIGATOR_KEY = 'SettingsSplitNavigator-test';
 
 type EditAgentPageRoute = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.EDIT>['route'];
 type EditAgentPageNavigation = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.EDIT>['navigation'];
 
-const mockRoute = {key: 'Settings_Agents_Edit-test', params: {accountID: TEST_ACCOUNT_ID}} as EditAgentPageRoute;
-const mockNavigation = {getState: () => ({key: TEST_NAVIGATOR_KEY})} as EditAgentPageNavigation;
-const getSelectedAccountID = (options: Parameters<typeof useOnyx>[1], mapping: OptimisticAgentAccountIDMapping | undefined): number | undefined => {
-    const selectedAccountID = options?.selector?.(mapping);
-    return typeof selectedAccountID === 'number' ? selectedAccountID : undefined;
-};
+const mockRoute = {params: {accountID: TEST_ACCOUNT_ID}} as EditAgentPageRoute;
+const mockNavigation = {} as EditAgentPageNavigation;
 
 describe('EditAgentPage', () => {
     beforeEach(() => {
         jest.clearAllMocks();
-        mockUseIsFocused.mockReturnValue(true);
         mockUseOnyx.mockImplementation((key, options) => {
             if (key === ONYXKEYS.PERSONAL_DETAILS_LIST && options?.selector) {
                 return [{displayName: 'Default Agent'}, {status: 'loaded'}];
@@ -290,91 +277,4 @@ describe('EditAgentPage', () => {
 
         expect(JSON.stringify(toJSON())).not.toContain('notFound.notHere');
     });
-
-    it('renders the route agent data when no optimistic accountID mapping exists', () => {
-        mockUseOnyx.mockImplementation((key, options) => {
-            if (key === ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING && options?.selector) {
-                const selectedAccountID = getSelectedAccountID(options, undefined);
-                expect(selectedAccountID).toBeUndefined();
-                return [selectedAccountID, {status: 'loaded'}];
-            }
-            if (key === `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_ACCOUNT_ID}`) {
-                return [{prompt: 'Route prompt'}, {status: 'loaded'}];
-            }
-            if (key === ONYXKEYS.PERSONAL_DETAILS_LIST && options?.selector) {
-                return [{displayName: 'Route Agent', login: 'agent_12345@expensify.ai'}, {status: 'loaded'}];
-            }
-            return [undefined, {status: 'loaded'}];
-        });
-
-        const {toJSON} = render(
-            <EditAgentPage
-                route={mockRoute}
-                navigation={mockNavigation}
-            />,
-        );
-
-        const serialized = JSON.stringify(toJSON());
-        expect(serialized).toContain('Route Agent');
-        expect(serialized).toContain('Route prompt');
-        expect(serialized).not.toContain('notFound.notHere');
-        expect(mockSetParams).not.toHaveBeenCalled();
-    });
-
-    it('renders the real agent data and updates the route param when the backend maps the optimistic route accountID', () => {
-        mockUseOnyx.mockImplementation((key, options) => {
-            if (key === ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING && options?.selector) {
-                const selectedAccountID = getSelectedAccountID(options, {[TEST_ACCOUNT_ID]: TEST_REAL_ACCOUNT_ID});
-                expect(selectedAccountID).toBe(TEST_REAL_ACCOUNT_ID);
-                return [selectedAccountID, {status: 'loaded'}];
-            }
-            if (key === `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_REAL_ACCOUNT_ID}`) {
-                return [{prompt: 'Real prompt'}, {status: 'loaded'}];
-            }
-            if (key === ONYXKEYS.PERSONAL_DETAILS_LIST && options?.selector) {
-                return [{displayName: 'Real Agent', login: 'agent_67890@expensify.ai'}, {status: 'loaded'}];
-            }
-            return [undefined, {status: 'loaded'}];
-        });
-
-        const {toJSON} = render(
-            <EditAgentPage
-                route={mockRoute}
-                navigation={mockNavigation}
-            />,
-        );
-
-        const serialized = JSON.stringify(toJSON());
-        expect(serialized).toContain('Real Agent');
-        expect(serialized).toContain('Real prompt');
-        expect(serialized).not.toContain('notFound.notHere');
-        expect(mockSetParams).toHaveBeenCalledWith({accountID: TEST_REAL_ACCOUNT_ID}, mockRoute.key, TEST_NAVIGATOR_KEY);
-    });
-
-    it('does not update the optimistic edit route while the edit page is not focused', () => {
-        mockUseIsFocused.mockReturnValue(false);
-        mockUseOnyx.mockImplementation((key, options) => {
-            if (key === ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING && options?.selector) {
-                const selectedAccountID = getSelectedAccountID(options, {[TEST_ACCOUNT_ID]: TEST_REAL_ACCOUNT_ID});
-                expect(selectedAccountID).toBe(TEST_REAL_ACCOUNT_ID);
-                return [selectedAccountID, {status: 'loaded'}];
-            }
-            if (key === `${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${TEST_REAL_ACCOUNT_ID}`) {
-                return [{prompt: 'Real prompt'}, {status: 'loaded'}];
-            }
-            if (key === ONYXKEYS.PERSONAL_DETAILS_LIST && options?.selector) {
-                return [{displayName: 'Real Agent', login: 'agent_67890@expensify.ai'}, {status: 'loaded'}];
-            }
-            return [undefined, {status: 'loaded'}];
-        });
-
-        render(
-            <EditAgentPage
-                route={mockRoute}
-                navigation={mockNavigation}
-            />,
-        );
-
-        expect(mockSetParams).not.toHaveBeenCalled();
-    });
 });

From d900c6805e88acf175591dff0eb91f29a04ea34c Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Fri, 14 Aug 2026 17:57:43 +0430
Subject: [PATCH 13/26] Resolve optimistic agent accountID via persisted
 mapping

---
 src/ONYXKEYS.ts                               |  6 +--
 src/SplashScreenStateContext.tsx              |  1 -
 src/hooks/useResolvedAgentAccountID.ts        | 18 +++++++
 src/libs/ExportOnyxState/common.ts            |  2 +-
 src/libs/Navigation/Navigation.ts             | 27 -----------
 .../reconcileOptimisticAgentAccountID.ts      | 47 -------------------
 src/pages/settings/Agents/EditAgentPage.tsx   |  8 +++-
 .../Agents/Fields/EditAgentAvatarPage.tsx     |  4 +-
 .../settings/Agents/Fields/EditNamePage.tsx   |  4 +-
 .../settings/Agents/Fields/EditPromptPage.tsx |  4 +-
 src/setup/index.ts                            |  1 -
 .../onyx/OptimisticAgentAccountIDMapping.ts   |  2 +-
 12 files changed, 38 insertions(+), 86 deletions(-)
 create mode 100644 src/hooks/useResolvedAgentAccountID.ts
 delete mode 100644 src/libs/actions/reconcileOptimisticAgentAccountID.ts

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index a3fde26465b1..871ef02e9a0e 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -87,8 +87,8 @@ const ONYXKEYS = {
     /** Contains all the personalDetails the user has access to, keyed by accountID */
     PERSONAL_DETAILS_LIST: 'personalDetailsList',
 
-    /** Maps an agent's optimistic accountID to the real accountID CreateAgent assigns, so in-flight navigation can resolve to the real agent */
-    RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING: 'optimisticAgentAccountIDMapping',
+    /** Maps an agent's optimistic accountID to the real one CreateAgent assigns, so an agent screen opened on the optimistic ID resolves to the real agent. Persisted so it survives a reload (the mapping is sent only once). */
+    OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING: 'optimisticAgentAccountIDMapping',
 
     /** Contains all the private personal details of the user */
     PRIVATE_PERSONAL_DETAILS: 'private_personalDetails',
@@ -1576,7 +1576,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.STATUS_DRAFT_CUSTOM_CLEAR_AFTER_DATE]: string;
     [ONYXKEYS.INPUT_FOCUSED]: boolean;
     [ONYXKEYS.PERSONAL_DETAILS_LIST]: OnyxTypes.PersonalDetailsList;
-    [ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING]: OnyxTypes.OptimisticAgentAccountIDMapping;
+    [ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING]: OnyxTypes.OptimisticAgentAccountIDMapping;
     [ONYXKEYS.PRIVATE_PERSONAL_DETAILS]: OnyxTypes.PrivatePersonalDetails;
     [ONYXKEYS.PERSONAL_DETAILS_METADATA]: Record<string, OnyxTypes.PersonalDetailsMetadata>;
     [ONYXKEYS.TASK]: OnyxTypes.Task;
diff --git a/src/SplashScreenStateContext.tsx b/src/SplashScreenStateContext.tsx
index c3131c72d0fa..f0f1a6d305d7 100644
--- a/src/SplashScreenStateContext.tsx
+++ b/src/SplashScreenStateContext.tsx
@@ -29,7 +29,6 @@ const SplashScreenActionsContext = React.createContext<SplashScreenActionsContex
 
 function loadPostSplashScreenModules() {
     import('./libs/actions/replaceOptimisticReportWithActualReport');
-    import('./libs/actions/reconcileOptimisticAgentAccountID');
     import('./libs/registerPaginationConfig');
     loadUnreadIndicatorUpdater();
 }
diff --git a/src/hooks/useResolvedAgentAccountID.ts b/src/hooks/useResolvedAgentAccountID.ts
new file mode 100644
index 000000000000..2548ba9d8ff5
--- /dev/null
+++ b/src/hooks/useResolvedAgentAccountID.ts
@@ -0,0 +1,18 @@
+import useOnyx from '@hooks/useOnyx';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+
+/**
+ * Resolves an agent's optimistic accountID to the real one CreateAgent assigns, via the persisted
+ * `OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING`, so an agent screen opened on the optimistic accountID (even after a reload)
+ * shows the real agent instead of "Hmm... it's not here". Persisted because the backend sends the mapping only once.
+ *
+ * @returns `[resolvedAccountID, isMappingLoaded]` - a not-found screen should wait for `isMappingLoaded` to avoid a
+ *          brief not-found flash while the mapping loads. No-op (returns the input) when there's no mapping entry.
+ */
+function useResolvedAgentAccountID(routeAccountID: number): [number, boolean] {
+    const [realAccountID, mappingMetadata] = useOnyx(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, {selector: (mapping) => mapping?.[routeAccountID]});
+    return [realAccountID ?? routeAccountID, mappingMetadata.status === 'loaded'];
+}
+
+export default useResolvedAgentAccountID;
diff --git a/src/libs/ExportOnyxState/common.ts b/src/libs/ExportOnyxState/common.ts
index cfe38c9b82c1..d5e91104341d 100644
--- a/src/libs/ExportOnyxState/common.ts
+++ b/src/libs/ExportOnyxState/common.ts
@@ -26,7 +26,7 @@ const onyxKeysToRemove = new Set<ValueOf<typeof ONYXKEYS> | ValueOf<typeof ONYXK
     ONYXKEYS.NVP_PRIVATE_BILLING_STATUS,
     ONYXKEYS.RAM_ONLY_PLAID_LINK_TOKEN,
     ONYXKEYS.RAM_ONLY_MERGE_HR_LINK_TOKEN,
-    ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING,
+    ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING,
     ONYXKEYS.RAM_ONLY_IS_PRODUCT_MARKETING_WINDOW_COVERED,
     ONYXKEYS.ONFIDO_TOKEN,
     ONYXKEYS.ONFIDO_APPLICANT_ID,
diff --git a/src/libs/Navigation/Navigation.ts b/src/libs/Navigation/Navigation.ts
index 9b92332d6b61..2ba05fcf51a2 100644
--- a/src/libs/Navigation/Navigation.ts
+++ b/src/libs/Navigation/Navigation.ts
@@ -830,32 +830,6 @@ function getReportRouteByID(reportID?: string, routes: NavigationRoute[] = navig
     return null;
 }
 
-const AGENT_ACCOUNT_ID_SCREEN_NAMES = new Set<string>([
-    SCREENS.SETTINGS.AGENTS.EDIT,
-    SCREENS.SETTINGS.AGENTS.EDIT_NAME,
-    SCREENS.SETTINGS.AGENTS.EDIT_PROMPT,
-    SCREENS.SETTINGS.AGENTS.EDIT_AVATAR,
-]);
-
-/**
- * Finds every currently mounted agent screen (edit, edit name/prompt/avatar) whose `accountID` param matches the given
- * value, anywhere in the navigation tree (not just the focused route) - a stacked-but-backgrounded screen (e.g. the
- * Edit page behind Edit Name) needs its param fixed too, or it shows "Hmm... it's not here" once it regains focus.
- * Returns each match with the key of the navigator that directly owns it, for use as `setParams`'s `targetKey`.
- */
-function getAgentAccountIDRoutes(accountID: number, routes: NavigationRoute[] = navigationRef.getRootState().routes, targetKey?: string): Array<{routeKey: string; targetKey?: string}> {
-    const matches: Array<{routeKey: string; targetKey?: string}> = [];
-    for (const route of routes) {
-        if (!!route.key && AGENT_ACCOUNT_ID_SCREEN_NAMES.has(route.name) && !!route.params && 'accountID' in route.params && Number(route.params.accountID) === accountID) {
-            matches.push({routeKey: route.key, targetKey});
-        }
-        if (route.state?.routes) {
-            matches.push(...getAgentAccountIDRoutes(accountID, route.state.routes, route.state.key));
-        }
-    }
-    return matches;
-}
-
 function getTopmostSuperWideRHPReportParams(
     state: NavigationState = navigationRef.getRootState(),
 ): RightModalNavigatorParamList[typeof SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT] | RightModalNavigatorParamList[typeof SCREENS.RIGHT_MODAL.EXPENSE_REPORT] | undefined {
@@ -1325,7 +1299,6 @@ export default {
     removeScreenByKey,
     removeReportScreen,
     getReportRouteByID,
-    getAgentAccountIDRoutes,
     replaceWithSplitNavigator,
     isTopmostRouteModalScreen,
     isOnboardingFlow,
diff --git a/src/libs/actions/reconcileOptimisticAgentAccountID.ts b/src/libs/actions/reconcileOptimisticAgentAccountID.ts
deleted file mode 100644
index 64acda32f173..000000000000
--- a/src/libs/actions/reconcileOptimisticAgentAccountID.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import Navigation from '@libs/Navigation/Navigation';
-
-import ONYXKEYS from '@src/ONYXKEYS';
-import type {OptimisticAgentAccountIDMapping} from '@src/types/onyx';
-
-import Onyx from 'react-native-onyx';
-
-/**
- * reconcileOptimisticAgentAccountID
- *
- * THE PROBLEM:
- * Creating an agent writes it to Onyx under a temporary, client-generated accountID so the Agents list can show it
- * immediately (offline-first UX). If an agent screen (Edit, Edit Name, Edit Prompt, Edit Avatar - reachable from the
- * Agents list or from the agent's own Profile page) is opened before CreateAgent resolves, it mounts with that
- * optimistic accountID in its route params.
- *
- * THE SOLUTION:
- * Once the server assigns the real accountID, CreateAgent's response merges
- * {[optimisticAccountID]: realAccountID} into RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING (the real agent data is
- * already written under the real accountID by that same response - only the route params need fixing). This module
- * is the single place that reacts to the mapping: it walks the whole navigation tree for every agent screen still
- * parameterized by the optimistic accountID - not just the focused one, since a screen can be stacked behind another
- * - and swaps in the real accountID, so those screens keep working instead of falling into "Hmm... it's not here" or
- * submitting a write against an accountID the backend no longer recognizes.
- */
-Onyx.connectWithoutView({
-    key: ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING,
-    callback: (mapping: OptimisticAgentAccountIDMapping | undefined) => {
-        if (!mapping) {
-            return;
-        }
-
-        for (const [optimisticAccountIDKey, realAccountID] of Object.entries(mapping)) {
-            const optimisticAccountID = Number(optimisticAccountIDKey);
-            const routes = Navigation.getAgentAccountIDRoutes(optimisticAccountID);
-            for (const route of routes) {
-                Navigation.setParams({accountID: realAccountID}, route.routeKey, route.targetKey);
-            }
-
-            // The mapping only exists to bridge an already-open optimistic route; once swept, drop the entry so this
-            // RAM-only map doesn't grow by one dead entry per agent created for the rest of the session.
-            Onyx.merge(ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, {[optimisticAccountIDKey]: null});
-        }
-    },
-});
-
-export default {};
diff --git a/src/pages/settings/Agents/EditAgentPage.tsx b/src/pages/settings/Agents/EditAgentPage.tsx
index 09343a22996e..70c1e42e9485 100644
--- a/src/pages/settings/Agents/EditAgentPage.tsx
+++ b/src/pages/settings/Agents/EditAgentPage.tsx
@@ -13,6 +13,7 @@ import useConfirmModal from '@hooks/useConfirmModal';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import useResolvedAgentAccountID from '@hooks/useResolvedAgentAccountID';
 import useRuleBotGuardModal from '@hooks/useRuleBotGuardModal';
 import useSwitchToDelegator from '@hooks/useSwitchToDelegator';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -40,7 +41,8 @@ function EditAgentPage({route}: EditAgentPageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const icons = useMemoizedLazyExpensifyIcons(['Trashcan', 'ChatBubble', 'Users']);
-    const accountID = route.params.accountID;
+    // Resolve the optimistic accountID to the real one so opening this page mid-CreateAgent (or after a reload) doesn't 404.
+    const [accountID, isResolvedAccountIDLoaded] = useResolvedAgentAccountID(route.params.accountID);
     const [agent, agentMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`);
     const [personalDetails, personalDetailsMetadata] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: (list) => list?.[accountID]});
     const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
@@ -48,7 +50,9 @@ function EditAgentPage({route}: EditAgentPageProps) {
     const showRuleBotGuardModal = useRuleBotGuardModal();
     const chatWithAgent = useChatWithAgent();
     const switchToDelegator = useSwitchToDelegator();
-    const isOnyxLoaded = agentMetadata.status === 'loaded' && personalDetailsMetadata.status === 'loaded';
+    // Wait for the optimistic->real mapping to load too, so an optimistic accountID that is about to resolve after a
+    // reload doesn't briefly flash the not-found page before the mapping is read from storage.
+    const isOnyxLoaded = isResolvedAccountIDLoaded && agentMetadata.status === 'loaded' && personalDetailsMetadata.status === 'loaded';
     const shouldShowNotFoundPage = isOnyxLoaded && !agent && !personalDetails;
 
     const agentLogin = personalDetails?.login ?? '';
diff --git a/src/pages/settings/Agents/Fields/EditAgentAvatarPage.tsx b/src/pages/settings/Agents/Fields/EditAgentAvatarPage.tsx
index 9166a7b33053..b706f1f38327 100644
--- a/src/pages/settings/Agents/Fields/EditAgentAvatarPage.tsx
+++ b/src/pages/settings/Agents/Fields/EditAgentAvatarPage.tsx
@@ -13,6 +13,7 @@ import useDiscardChangesConfirmation from '@hooks/useDiscardChangesConfirmation'
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import useResolvedAgentAccountID from '@hooks/useResolvedAgentAccountID';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {AGENT_AVATARS} from '@libs/Avatars/AgentAvatarCatalog';
@@ -227,7 +228,8 @@ function EditAgentAvatarContent({accountID, fallbackRoute, onSave, initialPreset
 EditAgentAvatarContent.displayName = 'EditAgentAvatarContent';
 
 function EditAgentAvatarPage({route}: EditAgentAvatarPageProps) {
-    const {accountID} = route.params;
+    // Resolve the optimistic accountID to the real one so opening this page mid-CreateAgent (or after a reload) doesn't 404.
+    const [accountID] = useResolvedAgentAccountID(route.params.accountID);
     return (
         <EditAgentAvatarContent
             accountID={accountID}
diff --git a/src/pages/settings/Agents/Fields/EditNamePage.tsx b/src/pages/settings/Agents/Fields/EditNamePage.tsx
index 6012562e1784..ba382953e6d5 100644
--- a/src/pages/settings/Agents/Fields/EditNamePage.tsx
+++ b/src/pages/settings/Agents/Fields/EditNamePage.tsx
@@ -8,6 +8,7 @@ import TextInput from '@components/TextInput';
 import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import useResolvedAgentAccountID from '@hooks/useResolvedAgentAccountID';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {updateAgentName} from '@libs/actions/Agent';
@@ -28,7 +29,8 @@ type EditNamePageProps = PlatformStackScreenProps<SettingsNavigatorParamList, ty
 function EditNamePage({route}: EditNamePageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const accountID = route.params.accountID;
+    // Resolve the optimistic accountID to the real one so opening this page mid-CreateAgent (or after a reload) doesn't 404.
+    const [accountID] = useResolvedAgentAccountID(route.params.accountID);
     const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: (list) => list?.[accountID]});
 
     const {inputCallbackRef} = useAutoFocusInput();
diff --git a/src/pages/settings/Agents/Fields/EditPromptPage.tsx b/src/pages/settings/Agents/Fields/EditPromptPage.tsx
index f36906698a6b..455fa55cecfb 100644
--- a/src/pages/settings/Agents/Fields/EditPromptPage.tsx
+++ b/src/pages/settings/Agents/Fields/EditPromptPage.tsx
@@ -10,6 +10,7 @@ import useIsInLandscapeMode from '@hooks/useIsInLandscapeMode';
 import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import useResolvedAgentAccountID from '@hooks/useResolvedAgentAccountID';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {updateAgentPrompt} from '@libs/actions/Agent';
@@ -32,7 +33,8 @@ function EditPromptPage({route}: EditPromptPageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const shouldUseScrollableLayout = useIsInLandscapeMode();
-    const accountID = route.params.accountID;
+    // Resolve the optimistic accountID to the real one so opening this page mid-CreateAgent (or after a reload) doesn't 404.
+    const [accountID] = useResolvedAgentAccountID(route.params.accountID);
     const [agentPrompt] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`);
 
     const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_AGENT_PROMPT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.EDIT_AGENT_PROMPT_FORM> => {
diff --git a/src/setup/index.ts b/src/setup/index.ts
index 1ae3b3b544c0..bd1533bdcb66 100644
--- a/src/setup/index.ts
+++ b/src/setup/index.ts
@@ -79,7 +79,6 @@ export default function () {
             ONYXKEYS.COLLECTION.RAM_ONLY_COMPANY_CARDS_LOADING_STATE,
             ONYXKEYS.RAM_ONLY_PLAID_LINK_TOKEN,
             ONYXKEYS.RAM_ONLY_MERGE_HR_LINK_TOKEN,
-            ONYXKEYS.RAM_ONLY_OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING,
             ONYXKEYS.COLLECTION.RAM_ONLY_ISSUE_NEW_EXPENSIFY_CARD,
             ONYXKEYS.RAM_ONLY_DOMAIN_MEMBERS_SELECTED_FOR_MOVE,
             ONYXKEYS.RAM_ONLY_HAS_DISMISSED_CONCIERGE_NOTIFICATION_BANNER,
diff --git a/src/types/onyx/OptimisticAgentAccountIDMapping.ts b/src/types/onyx/OptimisticAgentAccountIDMapping.ts
index 15db7c71dd1f..b96e5f50204b 100644
--- a/src/types/onyx/OptimisticAgentAccountIDMapping.ts
+++ b/src/types/onyx/OptimisticAgentAccountIDMapping.ts
@@ -1,6 +1,6 @@
 /**
  * Maps an agent's optimistic (client-generated) accountID to the real accountID the backend assigns once CreateAgent resolves.
- * Backend-populated via CreateAgent's onyxData; RAM-only because an optimistic accountID is meaningless after a reload.
+ * Backend-populated via CreateAgent's onyxData; persisted so the optimistic accountID still resolves after a reload.
  */
 type OptimisticAgentAccountIDMapping = Record<string, number>;
 

From 0e19104831a52c729236e884deab8ad4dd13a218 Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Fri, 14 Aug 2026 18:09:50 +0430
Subject: [PATCH 14/26] fix: lint

---
 src/hooks/useResolvedAgentAccountID.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hooks/useResolvedAgentAccountID.ts b/src/hooks/useResolvedAgentAccountID.ts
index 2548ba9d8ff5..b29c06a54a3b 100644
--- a/src/hooks/useResolvedAgentAccountID.ts
+++ b/src/hooks/useResolvedAgentAccountID.ts
@@ -1,7 +1,7 @@
-import useOnyx from '@hooks/useOnyx';
-
 import ONYXKEYS from '@src/ONYXKEYS';
 
+import useOnyx from './useOnyx';
+
 /**
  * Resolves an agent's optimistic accountID to the real one CreateAgent assigns, via the persisted
  * `OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING`, so an agent screen opened on the optimistic accountID (even after a reload)

From 75fac6e19623d89886df65950dbafb9cb39c7510 Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Mon, 17 Aug 2026 12:01:12 +0430
Subject: [PATCH 15/26] Fix agent navigation accountID inconsistency

---
 src/pages/settings/Agents/EditAgentPage.tsx              | 7 ++++---
 src/pages/settings/Agents/Fields/EditAgentAvatarPage.tsx | 2 +-
 src/pages/settings/Agents/Fields/EditNamePage.tsx        | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/pages/settings/Agents/EditAgentPage.tsx b/src/pages/settings/Agents/EditAgentPage.tsx
index 26d50baa71c6..4764225e1ef8 100644
--- a/src/pages/settings/Agents/EditAgentPage.tsx
+++ b/src/pages/settings/Agents/EditAgentPage.tsx
@@ -57,9 +57,10 @@ function EditAgentPage({route}: EditAgentPageProps) {
 
     const agentLogin = personalDetails?.login ?? '';
     const handleBackPress = () => Navigation.goBack();
-    const handleEditAvatarPress = () => Navigation.navigate(ROUTES.SETTINGS_AGENTS_EDIT_AVATAR.getRoute(accountID));
-    const handleEditNamePress = () => Navigation.navigate(ROUTES.SETTINGS_AGENTS_EDIT_NAME.getRoute(accountID));
-    const handleEditPromptPress = () => Navigation.navigate(ROUTES.SETTINGS_AGENTS_EDIT_PROMPT.getRoute(accountID));
+    // Navigate with the raw route accountID (not the resolved one) so the sub-page URL stays consistent with this page's URL and device back doesn't create a duplicate entry.
+    const handleEditAvatarPress = () => Navigation.navigate(ROUTES.SETTINGS_AGENTS_EDIT_AVATAR.getRoute(route.params.accountID));
+    const handleEditNamePress = () => Navigation.navigate(ROUTES.SETTINGS_AGENTS_EDIT_NAME.getRoute(route.params.accountID));
+    const handleEditPromptPress = () => Navigation.navigate(ROUTES.SETTINGS_AGENTS_EDIT_PROMPT.getRoute(route.params.accountID));
     const handleDeletePress = async () => {
         const ruleBotEnforcedPolicy = getRuleBotEnforcedPolicy(accountID, allPolicies);
         if (ruleBotEnforcedPolicy) {
diff --git a/src/pages/settings/Agents/Fields/EditAgentAvatarPage.tsx b/src/pages/settings/Agents/Fields/EditAgentAvatarPage.tsx
index 573be1b61681..01d48e109b29 100644
--- a/src/pages/settings/Agents/Fields/EditAgentAvatarPage.tsx
+++ b/src/pages/settings/Agents/Fields/EditAgentAvatarPage.tsx
@@ -234,7 +234,7 @@ function EditAgentAvatarPage({route}: EditAgentAvatarPageProps) {
     return (
         <EditAgentAvatarContent
             accountID={accountID}
-            fallbackRoute={ROUTES.SETTINGS_AGENTS_EDIT.getRoute(accountID)}
+            fallbackRoute={ROUTES.SETTINGS_AGENTS_EDIT.getRoute(route.params.accountID)}
         />
     );
 }
diff --git a/src/pages/settings/Agents/Fields/EditNamePage.tsx b/src/pages/settings/Agents/Fields/EditNamePage.tsx
index ba382953e6d5..c3fbd99b0af9 100644
--- a/src/pages/settings/Agents/Fields/EditNamePage.tsx
+++ b/src/pages/settings/Agents/Fields/EditNamePage.tsx
@@ -37,7 +37,7 @@ function EditNamePage({route}: EditNamePageProps) {
 
     const handleSubmit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_AGENT_NAME_FORM>) => {
         updateAgentName(accountID, values[INPUT_IDS.FIRST_NAME].trim(), personalDetails?.displayName ?? '');
-        Navigation.goBack(ROUTES.SETTINGS_AGENTS_EDIT.getRoute(accountID));
+        Navigation.goBack(ROUTES.SETTINGS_AGENTS_EDIT.getRoute(route.params.accountID));
     };
 
     return (
@@ -49,7 +49,7 @@ function EditNamePage({route}: EditNamePageProps) {
         >
             <HeaderWithBackButton
                 title={translate('editAgentNamePage.title')}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_AGENTS_EDIT.getRoute(accountID))}
+                onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_AGENTS_EDIT.getRoute(route.params.accountID))}
             />
             <FormProvider
                 formID={ONYXKEYS.FORMS.EDIT_AGENT_NAME_FORM}

From cf361249c9e7d28405cc9dcf966a40e612d6b4b2 Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Fri, 21 Aug 2026 15:47:34 +0430
Subject: [PATCH 16/26] Remove stale entries from
 optimisticAgentAccountIDMapping

---
 src/ONYXKEYS.ts                               |  4 ++
 src/libs/ExportOnyxState/common.ts            |  1 +
 src/libs/actions/Agent.ts                     | 41 ++++++++++++++++---
 src/pages/settings/Agents/AddAgentPage.tsx    | 26 +++++++++++-
 src/pages/settings/Agents/AgentsPage.tsx      |  7 +++-
 ...ptimisticAgentAccountIDMappingCreatedAt.ts |  7 ++++
 src/types/onyx/index.ts                       |  2 +
 .../unit/pages/settings/AddAgentPageTest.tsx  |  6 +--
 8 files changed, 83 insertions(+), 11 deletions(-)
 create mode 100644 src/types/onyx/OptimisticAgentAccountIDMappingCreatedAt.ts

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index ac8c59856792..370c9605ed2d 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -90,6 +90,9 @@ const ONYXKEYS = {
     /** Maps an agent's optimistic accountID to the real one CreateAgent assigns, so an agent screen opened on the optimistic ID resolves to the real agent. Persisted so it survives a reload (the mapping is sent only once). */
     OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING: 'optimisticAgentAccountIDMapping',
 
+    /** When each OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING entry was written locally, so stale entries can be pruned. */
+    OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT: 'optimisticAgentAccountIDMappingCreatedAt',
+
     /** Contains all the private personal details of the user */
     PRIVATE_PERSONAL_DETAILS: 'private_personalDetails',
 
@@ -1579,6 +1582,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.INPUT_FOCUSED]: boolean;
     [ONYXKEYS.PERSONAL_DETAILS_LIST]: OnyxTypes.PersonalDetailsList;
     [ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING]: OnyxTypes.OptimisticAgentAccountIDMapping;
+    [ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT]: OnyxTypes.OptimisticAgentAccountIDMappingCreatedAt;
     [ONYXKEYS.PRIVATE_PERSONAL_DETAILS]: OnyxTypes.PrivatePersonalDetails;
     [ONYXKEYS.PERSONAL_DETAILS_METADATA]: Record<string, OnyxTypes.PersonalDetailsMetadata>;
     [ONYXKEYS.TASK]: OnyxTypes.Task;
diff --git a/src/libs/ExportOnyxState/common.ts b/src/libs/ExportOnyxState/common.ts
index 6738c4238abf..945c6943aa85 100644
--- a/src/libs/ExportOnyxState/common.ts
+++ b/src/libs/ExportOnyxState/common.ts
@@ -27,6 +27,7 @@ const onyxKeysToRemove = new Set<ValueOf<typeof ONYXKEYS> | ValueOf<typeof ONYXK
     ONYXKEYS.RAM_ONLY_PLAID_LINK_TOKEN,
     ONYXKEYS.RAM_ONLY_MERGE_HR_LINK_TOKEN,
     ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING,
+    ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT,
     ONYXKEYS.RAM_ONLY_IS_PRODUCT_MARKETING_WINDOW_COVERED,
     ONYXKEYS.ONFIDO_TOKEN,
     ONYXKEYS.ONFIDO_APPLICANT_ID,
diff --git a/src/libs/actions/Agent.ts b/src/libs/actions/Agent.ts
index cbe9cba393de..5b4ae9c9f592 100644
--- a/src/libs/actions/Agent.ts
+++ b/src/libs/actions/Agent.ts
@@ -12,17 +12,38 @@ import type {AvatarSource} from '@libs/UserAvatarUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {Policy} from '@src/types/onyx';
+import type {OptimisticAgentAccountIDMappingCreatedAt, Policy} from '@src/types/onyx';
 import type NewAgentTemplate from '@src/types/onyx/NewAgentTemplate';
 import type PolicyEmployee from '@src/types/onyx/PolicyEmployee';
 import type {AnyOnyxUpdate} from '@src/types/onyx/Request';
 
-import type {OnyxCollection, OnyxCollectionInputValue, OnyxUpdate} from 'react-native-onyx';
+import type {OnyxCollection, OnyxCollectionInputValue, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
 
 import Onyx from 'react-native-onyx';
 
-function openAgentsPage() {
-    const finallyData: Array<OnyxUpdate<typeof ONYXKEYS.ARE_AGENTS_LOADED>> = [
+const OPTIMISTIC_ACCOUNT_ID_MAPPING_MAX_AGE_MS = 30 * 24 * 60 * 60 * 1000;
+
+// Called from both createAgent() and openAgentsPage() (the two points that have this data on hand) instead of a
+// boot-time sweep, to avoid adding a new Onyx.connectWithoutView subscription.
+function getStaleOptimisticAccountIDMappingUpdates(existingOptimisticAccountIDMappingCreatedAt: OnyxEntry<OptimisticAgentAccountIDMappingCreatedAt>): AnyOnyxUpdate[] {
+    const now = Date.now();
+    const staleOptimisticAccountIDs = Object.entries(existingOptimisticAccountIDMappingCreatedAt ?? {})
+        .filter(([, createdAt]) => now - createdAt > OPTIMISTIC_ACCOUNT_ID_MAPPING_MAX_AGE_MS)
+        .map(([staleOptimisticAccountID]) => staleOptimisticAccountID);
+
+    if (staleOptimisticAccountIDs.length === 0) {
+        return [];
+    }
+
+    const staleEntries = Object.fromEntries(staleOptimisticAccountIDs.map((id) => [id, null]));
+    return [
+        {onyxMethod: Onyx.METHOD.MERGE, key: ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, value: staleEntries},
+        {onyxMethod: Onyx.METHOD.MERGE, key: ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT, value: staleEntries},
+    ];
+}
+
+function openAgentsPage(existingOptimisticAccountIDMappingCreatedAt?: OnyxEntry<OptimisticAgentAccountIDMappingCreatedAt>) {
+    const finallyData: AnyOnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.ARE_AGENTS_LOADED,
@@ -30,7 +51,9 @@ function openAgentsPage() {
         },
     ];
 
-    read(READ_COMMANDS.OPEN_AGENTS_PAGE, null, {finallyData});
+    const optimisticData = getStaleOptimisticAccountIDMappingUpdates(existingOptimisticAccountIDMappingCreatedAt);
+
+    read(READ_COMMANDS.OPEN_AGENTS_PAGE, null, {optimisticData, finallyData});
 }
 
 function openProfilePage() {
@@ -46,6 +69,7 @@ function createAgent(
     file?: File | CustomRNImageManipulatorResult,
     optimisticAvatarURI?: string,
     policyID?: string,
+    existingOptimisticAccountIDMappingCreatedAt?: OnyxEntry<OptimisticAgentAccountIDMappingCreatedAt>,
 ) {
     const optimisticAccountID = Number(generateReportID());
 
@@ -106,6 +130,7 @@ function createAgent(
             key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${optimisticReportID}`,
             value: {isOptimisticReport: true},
         },
+        ...getStaleOptimisticAccountIDMappingUpdates(existingOptimisticAccountIDMappingCreatedAt),
     ];
 
     const successData: AnyOnyxUpdate[] = [
@@ -129,6 +154,12 @@ function createAgent(
             key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${optimisticReportID}`,
             value: {isOptimisticReport: false},
         },
+        // Stamped here, not where the mapping itself arrives, since that onyxData is backend-owned.
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT,
+            value: {[optimisticAccountID]: Date.now()},
+        },
     ];
 
     const failureData: AnyOnyxUpdate[] = [
diff --git a/src/pages/settings/Agents/AddAgentPage.tsx b/src/pages/settings/Agents/AddAgentPage.tsx
index 16a8d2faad0d..8045baff87ab 100644
--- a/src/pages/settings/Agents/AddAgentPage.tsx
+++ b/src/pages/settings/Agents/AddAgentPage.tsx
@@ -65,6 +65,8 @@ function AddAgentPageContent({route, template}: AddAgentPageContentProps) {
     const expensifyIcons = useMemoizedLazyExpensifyIcons(['Pencil']);
     const [avatarDraft, avatarDraftMetadata] = useOnyx(ONYXKEYS.AGENT_NEW_AVATAR_DRAFT);
     const isDraftLoading = isLoadingOnyxValue(avatarDraftMetadata);
+    // Read here (rather than inside createAgent()) so the write action stays a pure function of its params.
+    const [optimisticAgentAccountIDMappingCreatedAt] = useOnyx(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT);
     const hasSubmittedRef = useRef(false);
     const formRef = useRef<FormRef>(null);
 
@@ -131,8 +133,28 @@ function AddAgentPageContent({route, template}: AddAgentPageContentProps) {
         // reportID it generates client-side, and CreateAgent creates the DM under that exact ID (see
         // CreateAgent.cpp), so we can navigate to the DM immediately, online or offline, without waiting.
         const {optimisticReportID} = uploadedAvatar?.uri
-            ? createAgent(firstName, prompt, ownerAccountID, ownerLogin, undefined, buildFileFromAvatarCropResult(uploadedAvatar), uploadedAvatar.uri, policyID)
-            : createAgent(firstName, prompt, ownerAccountID, ownerLogin, selectedPresetID ?? AGENT_AVATARS.getRandomID(), undefined, undefined, policyID);
+            ? createAgent(
+                  firstName,
+                  prompt,
+                  ownerAccountID,
+                  ownerLogin,
+                  undefined,
+                  buildFileFromAvatarCropResult(uploadedAvatar),
+                  uploadedAvatar.uri,
+                  policyID,
+                  optimisticAgentAccountIDMappingCreatedAt,
+              )
+            : createAgent(
+                  firstName,
+                  prompt,
+                  ownerAccountID,
+                  ownerLogin,
+                  selectedPresetID ?? AGENT_AVATARS.getRandomID(),
+                  undefined,
+                  undefined,
+                  policyID,
+                  optimisticAgentAccountIDMappingCreatedAt,
+              );
 
         clearNewAgentTemplate();
         clearNewAgentAvatarDraft();
diff --git a/src/pages/settings/Agents/AgentsPage.tsx b/src/pages/settings/Agents/AgentsPage.tsx
index 618688ffc52e..fdf0e596b322 100644
--- a/src/pages/settings/Agents/AgentsPage.tsx
+++ b/src/pages/settings/Agents/AgentsPage.tsx
@@ -65,6 +65,8 @@ function AgentsPage() {
 
     const [agentPrompts] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT);
     const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
+    // Read here (rather than inside openAgentsPage()) so the action stays a pure function of its params.
+    const [optimisticAgentAccountIDMappingCreatedAt] = useOnyx(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT);
     const personalDetailsList = usePersonalDetails();
     const canSelectMultiple = shouldUseNarrowLayout ? isMobileSelectionModeEnabled : true;
 
@@ -72,7 +74,10 @@ function AgentsPage() {
         if (!isCustomAgentEnabled) {
             return;
         }
-        openAgentsPage();
+        openAgentsPage(optimisticAgentAccountIDMappingCreatedAt);
+        // Only re-fire OPEN_AGENTS_PAGE when isCustomAgentEnabled changes, not on every mapping update
+        // (which happens after each agent creation) — the mapping is read fresh whenever this does run.
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [isCustomAgentEnabled]);
 
     const handleErrorClose = (pendingAction: PendingAction | null | undefined, accountID: number) => {
diff --git a/src/types/onyx/OptimisticAgentAccountIDMappingCreatedAt.ts b/src/types/onyx/OptimisticAgentAccountIDMappingCreatedAt.ts
new file mode 100644
index 000000000000..23b2fa5444b7
--- /dev/null
+++ b/src/types/onyx/OptimisticAgentAccountIDMappingCreatedAt.ts
@@ -0,0 +1,7 @@
+/**
+ * Records when each OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING entry was written locally, in ms since epoch (Date.now()).
+ * Client-only — the backend doesn't send a timestamp — so stale mapping entries can be pruned.
+ */
+type OptimisticAgentAccountIDMappingCreatedAt = Record<string, number>;
+
+export default OptimisticAgentAccountIDMappingCreatedAt;
diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts
index 4494218dc687..6b81247f13d9 100644
--- a/src/types/onyx/index.ts
+++ b/src/types/onyx/index.ts
@@ -117,6 +117,7 @@ import type OnboardingRHPVariant from './OnboardingRHPVariant';
 import type OnyxInputOrEntry from './OnyxInputOrEntry';
 import type {AnyOnyxUpdatesFromServer, OnyxUpdateEvent, OnyxUpdatesFromServer} from './OnyxUpdatesFromServer';
 import type OptimisticAgentAccountIDMapping from './OptimisticAgentAccountIDMapping';
+import type OptimisticAgentAccountIDMappingCreatedAt from './OptimisticAgentAccountIDMappingCreatedAt';
 import type {DecisionName, OriginalMessageIOU} from './OriginalMessage';
 import type Pages from './Pages';
 import type PendingConciergeResponse from './PendingConciergeResponse';
@@ -284,6 +285,7 @@ export type {
     OnyxUpdatesFromServer,
     AnyOnyxUpdatesFromServer,
     OptimisticAgentAccountIDMapping,
+    OptimisticAgentAccountIDMappingCreatedAt,
     OdometerDraft,
     Pages,
     ConciergePendingFollowupList,
diff --git a/tests/unit/pages/settings/AddAgentPageTest.tsx b/tests/unit/pages/settings/AddAgentPageTest.tsx
index 9c6049429907..0fee96383ff8 100644
--- a/tests/unit/pages/settings/AddAgentPageTest.tsx
+++ b/tests/unit/pages/settings/AddAgentPageTest.tsx
@@ -318,7 +318,7 @@ describe('AddAgentPage', () => {
 
             mockFormOnSubmit?.({firstName: 'Bot', prompt: 'Reject gambling.'});
 
-            expect(mockCreateAgent).toHaveBeenCalledWith('Bot', 'Reject gambling.', OWNER_ACCOUNT_ID, OWNER_LOGIN, 'bot-avatar--blue', undefined, undefined, undefined);
+            expect(mockCreateAgent).toHaveBeenCalledWith('Bot', 'Reject gambling.', OWNER_ACCOUNT_ID, OWNER_LOGIN, 'bot-avatar--blue', undefined, undefined, undefined, undefined);
             expect(mockClearNewAgentTemplate).toHaveBeenCalledTimes(1);
             expect(mockClearNewAgentAvatarDraft).toHaveBeenCalledTimes(1);
             expect(mockRevealRouteBeforeDismissingModal).toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(OPTIMISTIC_REPORT_ID));
@@ -329,7 +329,7 @@ describe('AddAgentPage', () => {
 
             mockFormOnSubmit?.({firstName: 'Bot', prompt: 'Reject gambling.'});
 
-            expect(mockCreateAgent).toHaveBeenCalledWith('Bot', 'Reject gambling.', OWNER_ACCOUNT_ID, OWNER_LOGIN, 'bot-avatar--blue', undefined, undefined, 'POL_42');
+            expect(mockCreateAgent).toHaveBeenCalledWith('Bot', 'Reject gambling.', OWNER_ACCOUNT_ID, OWNER_LOGIN, 'bot-avatar--blue', undefined, undefined, 'POL_42', undefined);
             expect(mockRevealRouteBeforeDismissingModal).toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(OPTIMISTIC_REPORT_ID));
         });
 
@@ -348,7 +348,7 @@ describe('AddAgentPage', () => {
 
             mockFormOnSubmit?.({firstName: 'Bot', prompt: 'Reject gambling.'});
 
-            expect(mockCreateAgent).toHaveBeenCalledWith('Bot', 'Reject gambling.', OWNER_ACCOUNT_ID, OWNER_LOGIN, 'bot-avatar--blue', undefined, undefined, undefined);
+            expect(mockCreateAgent).toHaveBeenCalledWith('Bot', 'Reject gambling.', OWNER_ACCOUNT_ID, OWNER_LOGIN, 'bot-avatar--blue', undefined, undefined, undefined, undefined);
         });
 
         it('creates the agent with the reconstructed uploaded file when a photo was uploaded', () => {

From 2a6549c06e99367cf81434c31691c83fe0b5f540 Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Fri, 21 Aug 2026 15:53:11 +0430
Subject: [PATCH 17/26] Add unit tests for agent mapping resolution and pruning

---
 tests/unit/AgentActionTest.ts                 | 118 +++++++++++++++++-
 .../hooks/useResolvedAgentAccountID.test.ts   |  69 ++++++++++
 2 files changed, 184 insertions(+), 3 deletions(-)
 create mode 100644 tests/unit/hooks/useResolvedAgentAccountID.test.ts

diff --git a/tests/unit/AgentActionTest.ts b/tests/unit/AgentActionTest.ts
index 1b6df9bdc8e9..9a70c931b31c 100644
--- a/tests/unit/AgentActionTest.ts
+++ b/tests/unit/AgentActionTest.ts
@@ -1,9 +1,9 @@
-import {write} from '@libs/API';
-import {WRITE_COMMANDS} from '@libs/API/types';
+import {read, write} from '@libs/API';
+import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import Navigation from '@libs/Navigation/Navigation';
 import {isRecord} from '@libs/ObjectUtils';
 
-import {clearAgentAvatarUpdateError, clearAgentUpdateError, createAgent, deleteAgent, updateAgentAvatar, updateAgentName, updateAgentPrompt} from '@userActions/Agent';
+import {clearAgentAvatarUpdateError, clearAgentUpdateError, createAgent, deleteAgent, openAgentsPage, updateAgentAvatar, updateAgentName, updateAgentPrompt} from '@userActions/Agent';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -21,6 +21,7 @@ jest.mock('@libs/API');
 jest.mock('@libs/Navigation/Navigation', () => ({navigate: jest.fn(), goBack: jest.fn()}));
 
 const mockWrite = jest.mocked(write);
+const mockRead = jest.mocked(read);
 const mockGoBack = jest.mocked(Navigation.goBack);
 
 type CapturedUpdate = Omit<AnyOnyxUpdate<OnyxKey>, 'value'> & {value?: unknown};
@@ -50,6 +51,21 @@ function getWriteOptions(): WriteOptions {
     };
 }
 
+type ReadOptions = {optimisticData: CapturedUpdate[]; finallyData: CapturedUpdate[]};
+
+function getReadOptions(): ReadOptions {
+    const options = mockRead.mock.calls.at(0)?.at(2);
+    if (!options || typeof options !== 'object') {
+        throw new Error('read was not called with onyx options');
+    }
+
+    const {optimisticData, finallyData} = options as {optimisticData?: CapturedUpdate[]; finallyData?: CapturedUpdate[]};
+    return {
+        optimisticData: optimisticData ?? [],
+        finallyData: finallyData ?? [],
+    };
+}
+
 function findUpdate(updates: CapturedUpdate[], key: OnyxKey): CapturedUpdate | undefined {
     return updates.find((update) => update.key === key);
 }
@@ -366,6 +382,102 @@ describe('createAgent', () => {
         });
         expect(promptValue.errors).toBeTruthy();
     });
+
+    it('stamps a createdAt timestamp for the new mapping entry in successData', () => {
+        const before = Date.now();
+        const result = createAgent('Bot', 'My prompt', OWNER_ACCOUNT_ID, OWNER_LOGIN);
+        const after = Date.now();
+
+        const {successData} = getWriteOptions();
+        const createdAtValue = getUpdateRecord(successData, ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT)[result.optimisticAccountID];
+
+        expect(createdAtValue).toBeGreaterThanOrEqual(before);
+        expect(createdAtValue).toBeLessThanOrEqual(after);
+    });
+
+    it('prunes mapping entries older than 30 days, keeping fresher ones', () => {
+        const now = Date.now();
+        const existingCreatedAt = {
+            '111': now - 31 * 24 * 60 * 60 * 1000,
+            '222': now - 1 * 24 * 60 * 60 * 1000,
+        };
+
+        createAgent('Bot', 'My prompt', OWNER_ACCOUNT_ID, OWNER_LOGIN, undefined, undefined, undefined, undefined, existingCreatedAt);
+
+        const {optimisticData} = getWriteOptions();
+        const mappingPrune = getUpdateRecord(optimisticData, ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING);
+        const timestampPrune = getUpdateRecord(optimisticData, ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT);
+
+        expect(mappingPrune['111']).toBeNull();
+        expect(mappingPrune['222']).toBeUndefined();
+        expect(timestampPrune['111']).toBeNull();
+        expect(timestampPrune['222']).toBeUndefined();
+    });
+
+    it('does not write mapping prune updates when nothing is stale', () => {
+        createAgent('Bot', 'My prompt', OWNER_ACCOUNT_ID, OWNER_LOGIN, undefined, undefined, undefined, undefined, {'222': Date.now() - 24 * 60 * 60 * 1000});
+
+        const {optimisticData} = getWriteOptions();
+        expect(findUpdate(optimisticData, ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING)).toBeUndefined();
+    });
+
+    it('does not write mapping prune updates when no existing timestamps are passed', () => {
+        createAgent('Bot', 'My prompt', OWNER_ACCOUNT_ID, OWNER_LOGIN);
+
+        const {optimisticData} = getWriteOptions();
+        expect(findUpdate(optimisticData, ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING)).toBeUndefined();
+    });
+});
+
+describe('openAgentsPage', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('calls read with OPEN_AGENTS_PAGE command', () => {
+        openAgentsPage();
+
+        expect(mockRead).toHaveBeenCalledWith(READ_COMMANDS.OPEN_AGENTS_PAGE, null, expect.any(Object));
+    });
+
+    it('sets ARE_AGENTS_LOADED to true in finallyData', () => {
+        openAgentsPage();
+
+        const {finallyData} = getReadOptions();
+        expect(findUpdate(finallyData, ONYXKEYS.ARE_AGENTS_LOADED)?.value).toBe(true);
+    });
+
+    it('prunes mapping entries older than 30 days, keeping fresher ones', () => {
+        const now = Date.now();
+        const existingCreatedAt = {
+            '111': now - 31 * 24 * 60 * 60 * 1000,
+            '222': now - 1 * 24 * 60 * 60 * 1000,
+        };
+
+        openAgentsPage(existingCreatedAt);
+
+        const {optimisticData} = getReadOptions();
+        const mappingPrune = getUpdateRecord(optimisticData, ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING);
+        const timestampPrune = getUpdateRecord(optimisticData, ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT);
+
+        expect(mappingPrune['111']).toBeNull();
+        expect(mappingPrune['222']).toBeUndefined();
+        expect(timestampPrune['111']).toBeNull();
+    });
+
+    it('does not write mapping prune updates when nothing is stale', () => {
+        openAgentsPage({'222': Date.now() - 24 * 60 * 60 * 1000});
+
+        const {optimisticData} = getReadOptions();
+        expect(findUpdate(optimisticData, ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING)).toBeUndefined();
+    });
+
+    it('does not write mapping prune updates when no existing timestamps are passed', () => {
+        openAgentsPage();
+
+        const {optimisticData} = getReadOptions();
+        expect(findUpdate(optimisticData, ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING)).toBeUndefined();
+    });
 });
 
 const TEST_ACCOUNT_ID = 42;
diff --git a/tests/unit/hooks/useResolvedAgentAccountID.test.ts b/tests/unit/hooks/useResolvedAgentAccountID.test.ts
new file mode 100644
index 000000000000..2aa60f2c0729
--- /dev/null
+++ b/tests/unit/hooks/useResolvedAgentAccountID.test.ts
@@ -0,0 +1,69 @@
+import {renderHook, waitFor} from '@testing-library/react-native';
+
+import useResolvedAgentAccountID from '@hooks/useResolvedAgentAccountID';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import Onyx from 'react-native-onyx';
+
+import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates';
+
+describe('useResolvedAgentAccountID', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        await Onyx.clear();
+        await waitForBatchedUpdates();
+    });
+
+    afterEach(async () => {
+        await Onyx.clear();
+    });
+
+    it('returns the route accountID when there is no mapping entry', async () => {
+        const {result} = renderHook(() => useResolvedAgentAccountID(111));
+
+        await waitFor(() => {
+            expect(result.current).toEqual([111, true]);
+        });
+    });
+
+    it('resolves to the real accountID when a mapping entry exists', async () => {
+        await Onyx.set(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, {111: 222});
+        await waitForBatchedUpdates();
+
+        const {result} = renderHook(() => useResolvedAgentAccountID(111));
+
+        await waitFor(() => {
+            expect(result.current).toEqual([222, true]);
+        });
+    });
+
+    it('does not resolve when the mapping has entries for other accountIDs only', async () => {
+        await Onyx.set(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, {999: 888});
+        await waitForBatchedUpdates();
+
+        const {result} = renderHook(() => useResolvedAgentAccountID(111));
+
+        await waitFor(() => {
+            expect(result.current).toEqual([111, true]);
+        });
+    });
+
+    it('updates reactively once the mapping arrives after the hook has already mounted', async () => {
+        const {result} = renderHook(() => useResolvedAgentAccountID(111));
+
+        await waitFor(() => {
+            expect(result.current).toEqual([111, true]);
+        });
+
+        await Onyx.merge(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, {111: 222});
+        await waitForBatchedUpdates();
+
+        await waitFor(() => {
+            expect(result.current).toEqual([222, true]);
+        });
+    });
+});

From 8a45f67b21c3f9b6b35e75d1f4b57e88d5fc66b9 Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Fri, 21 Aug 2026 16:03:39 +0430
Subject: [PATCH 18/26] Fix lint errors in agent mapping tests

---
 tests/unit/AgentActionTest.ts                 | 39 ++++++++++++-------
 .../hooks/useResolvedAgentAccountID.test.ts   | 29 ++++++++------
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/tests/unit/AgentActionTest.ts b/tests/unit/AgentActionTest.ts
index 9a70c931b31c..86ac1c3f89fd 100644
--- a/tests/unit/AgentActionTest.ts
+++ b/tests/unit/AgentActionTest.ts
@@ -55,11 +55,18 @@ type ReadOptions = {optimisticData: CapturedUpdate[]; finallyData: CapturedUpdat
 
 function getReadOptions(): ReadOptions {
     const options = mockRead.mock.calls.at(0)?.at(2);
-    if (!options || typeof options !== 'object') {
+    if (!options || typeof options !== 'object' || !('optimisticData' in options)) {
         throw new Error('read was not called with onyx options');
     }
 
-    const {optimisticData, finallyData} = options as {optimisticData?: CapturedUpdate[]; finallyData?: CapturedUpdate[]};
+    const {optimisticData, finallyData} = options;
+    if (optimisticData !== undefined && !Array.isArray(optimisticData)) {
+        throw new Error('optimisticData was not an update collection');
+    }
+    if (finallyData !== undefined && !Array.isArray(finallyData)) {
+        throw new Error('finallyData was not an update collection');
+    }
+
     return {
         optimisticData: optimisticData ?? [],
         finallyData: finallyData ?? [],
@@ -95,6 +102,8 @@ function getOptimisticAccountID(optimisticData: CapturedUpdate[]): number {
 
 const OWNER_ACCOUNT_ID = 999;
 const OWNER_LOGIN = 'owner@test.com';
+const STALE_OPTIMISTIC_ACCOUNT_ID = 111;
+const FRESH_OPTIMISTIC_ACCOUNT_ID = 222;
 
 describe('createAgent', () => {
     beforeEach(() => {
@@ -398,8 +407,8 @@ describe('createAgent', () => {
     it('prunes mapping entries older than 30 days, keeping fresher ones', () => {
         const now = Date.now();
         const existingCreatedAt = {
-            '111': now - 31 * 24 * 60 * 60 * 1000,
-            '222': now - 1 * 24 * 60 * 60 * 1000,
+            [STALE_OPTIMISTIC_ACCOUNT_ID]: now - 31 * 24 * 60 * 60 * 1000,
+            [FRESH_OPTIMISTIC_ACCOUNT_ID]: now - 1 * 24 * 60 * 60 * 1000,
         };
 
         createAgent('Bot', 'My prompt', OWNER_ACCOUNT_ID, OWNER_LOGIN, undefined, undefined, undefined, undefined, existingCreatedAt);
@@ -408,14 +417,14 @@ describe('createAgent', () => {
         const mappingPrune = getUpdateRecord(optimisticData, ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING);
         const timestampPrune = getUpdateRecord(optimisticData, ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT);
 
-        expect(mappingPrune['111']).toBeNull();
-        expect(mappingPrune['222']).toBeUndefined();
-        expect(timestampPrune['111']).toBeNull();
-        expect(timestampPrune['222']).toBeUndefined();
+        expect(mappingPrune[STALE_OPTIMISTIC_ACCOUNT_ID]).toBeNull();
+        expect(mappingPrune[FRESH_OPTIMISTIC_ACCOUNT_ID]).toBeUndefined();
+        expect(timestampPrune[STALE_OPTIMISTIC_ACCOUNT_ID]).toBeNull();
+        expect(timestampPrune[FRESH_OPTIMISTIC_ACCOUNT_ID]).toBeUndefined();
     });
 
     it('does not write mapping prune updates when nothing is stale', () => {
-        createAgent('Bot', 'My prompt', OWNER_ACCOUNT_ID, OWNER_LOGIN, undefined, undefined, undefined, undefined, {'222': Date.now() - 24 * 60 * 60 * 1000});
+        createAgent('Bot', 'My prompt', OWNER_ACCOUNT_ID, OWNER_LOGIN, undefined, undefined, undefined, undefined, {[FRESH_OPTIMISTIC_ACCOUNT_ID]: Date.now() - 24 * 60 * 60 * 1000});
 
         const {optimisticData} = getWriteOptions();
         expect(findUpdate(optimisticData, ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING)).toBeUndefined();
@@ -450,8 +459,8 @@ describe('openAgentsPage', () => {
     it('prunes mapping entries older than 30 days, keeping fresher ones', () => {
         const now = Date.now();
         const existingCreatedAt = {
-            '111': now - 31 * 24 * 60 * 60 * 1000,
-            '222': now - 1 * 24 * 60 * 60 * 1000,
+            [STALE_OPTIMISTIC_ACCOUNT_ID]: now - 31 * 24 * 60 * 60 * 1000,
+            [FRESH_OPTIMISTIC_ACCOUNT_ID]: now - 1 * 24 * 60 * 60 * 1000,
         };
 
         openAgentsPage(existingCreatedAt);
@@ -460,13 +469,13 @@ describe('openAgentsPage', () => {
         const mappingPrune = getUpdateRecord(optimisticData, ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING);
         const timestampPrune = getUpdateRecord(optimisticData, ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT);
 
-        expect(mappingPrune['111']).toBeNull();
-        expect(mappingPrune['222']).toBeUndefined();
-        expect(timestampPrune['111']).toBeNull();
+        expect(mappingPrune[STALE_OPTIMISTIC_ACCOUNT_ID]).toBeNull();
+        expect(mappingPrune[FRESH_OPTIMISTIC_ACCOUNT_ID]).toBeUndefined();
+        expect(timestampPrune[STALE_OPTIMISTIC_ACCOUNT_ID]).toBeNull();
     });
 
     it('does not write mapping prune updates when nothing is stale', () => {
-        openAgentsPage({'222': Date.now() - 24 * 60 * 60 * 1000});
+        openAgentsPage({[FRESH_OPTIMISTIC_ACCOUNT_ID]: Date.now() - 24 * 60 * 60 * 1000});
 
         const {optimisticData} = getReadOptions();
         expect(findUpdate(optimisticData, ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING)).toBeUndefined();
diff --git a/tests/unit/hooks/useResolvedAgentAccountID.test.ts b/tests/unit/hooks/useResolvedAgentAccountID.test.ts
index 2aa60f2c0729..18d30c30f83a 100644
--- a/tests/unit/hooks/useResolvedAgentAccountID.test.ts
+++ b/tests/unit/hooks/useResolvedAgentAccountID.test.ts
@@ -8,6 +8,11 @@ import Onyx from 'react-native-onyx';
 
 import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates';
 
+const OPTIMISTIC_ACCOUNT_ID = 111;
+const REAL_ACCOUNT_ID = 222;
+const OTHER_OPTIMISTIC_ACCOUNT_ID = 999;
+const OTHER_REAL_ACCOUNT_ID = 888;
+
 describe('useResolvedAgentAccountID', () => {
     beforeAll(() => {
         Onyx.init({keys: ONYXKEYS});
@@ -23,47 +28,47 @@ describe('useResolvedAgentAccountID', () => {
     });
 
     it('returns the route accountID when there is no mapping entry', async () => {
-        const {result} = renderHook(() => useResolvedAgentAccountID(111));
+        const {result} = renderHook(() => useResolvedAgentAccountID(OPTIMISTIC_ACCOUNT_ID));
 
         await waitFor(() => {
-            expect(result.current).toEqual([111, true]);
+            expect(result.current).toEqual([OPTIMISTIC_ACCOUNT_ID, true]);
         });
     });
 
     it('resolves to the real accountID when a mapping entry exists', async () => {
-        await Onyx.set(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, {111: 222});
+        await Onyx.set(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, {[OPTIMISTIC_ACCOUNT_ID]: REAL_ACCOUNT_ID});
         await waitForBatchedUpdates();
 
-        const {result} = renderHook(() => useResolvedAgentAccountID(111));
+        const {result} = renderHook(() => useResolvedAgentAccountID(OPTIMISTIC_ACCOUNT_ID));
 
         await waitFor(() => {
-            expect(result.current).toEqual([222, true]);
+            expect(result.current).toEqual([REAL_ACCOUNT_ID, true]);
         });
     });
 
     it('does not resolve when the mapping has entries for other accountIDs only', async () => {
-        await Onyx.set(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, {999: 888});
+        await Onyx.set(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, {[OTHER_OPTIMISTIC_ACCOUNT_ID]: OTHER_REAL_ACCOUNT_ID});
         await waitForBatchedUpdates();
 
-        const {result} = renderHook(() => useResolvedAgentAccountID(111));
+        const {result} = renderHook(() => useResolvedAgentAccountID(OPTIMISTIC_ACCOUNT_ID));
 
         await waitFor(() => {
-            expect(result.current).toEqual([111, true]);
+            expect(result.current).toEqual([OPTIMISTIC_ACCOUNT_ID, true]);
         });
     });
 
     it('updates reactively once the mapping arrives after the hook has already mounted', async () => {
-        const {result} = renderHook(() => useResolvedAgentAccountID(111));
+        const {result} = renderHook(() => useResolvedAgentAccountID(OPTIMISTIC_ACCOUNT_ID));
 
         await waitFor(() => {
-            expect(result.current).toEqual([111, true]);
+            expect(result.current).toEqual([OPTIMISTIC_ACCOUNT_ID, true]);
         });
 
-        await Onyx.merge(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, {111: 222});
+        await Onyx.merge(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, {[OPTIMISTIC_ACCOUNT_ID]: REAL_ACCOUNT_ID});
         await waitForBatchedUpdates();
 
         await waitFor(() => {
-            expect(result.current).toEqual([222, true]);
+            expect(result.current).toEqual([REAL_ACCOUNT_ID, true]);
         });
     });
 });

From aad8450406f7dc3a5782863ba147798909cf9126 Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Sat, 22 Aug 2026 12:25:54 +0430
Subject: [PATCH 19/26] Add blank line before comments

---
 src/libs/actions/Agent.ts                           | 1 +
 src/pages/settings/Agents/AddAgentPage.tsx          | 1 +
 src/pages/settings/Agents/AgentsPage.tsx            | 2 ++
 src/pages/settings/Agents/EditAgentPage.tsx         | 3 +++
 src/pages/settings/Agents/Fields/EditNamePage.tsx   | 1 +
 src/pages/settings/Agents/Fields/EditPromptPage.tsx | 1 +
 6 files changed, 9 insertions(+)

diff --git a/src/libs/actions/Agent.ts b/src/libs/actions/Agent.ts
index 5b4ae9c9f592..36c13279bf12 100644
--- a/src/libs/actions/Agent.ts
+++ b/src/libs/actions/Agent.ts
@@ -154,6 +154,7 @@ function createAgent(
             key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${optimisticReportID}`,
             value: {isOptimisticReport: false},
         },
+
         // Stamped here, not where the mapping itself arrives, since that onyxData is backend-owned.
         {
             onyxMethod: Onyx.METHOD.MERGE,
diff --git a/src/pages/settings/Agents/AddAgentPage.tsx b/src/pages/settings/Agents/AddAgentPage.tsx
index 8045baff87ab..0fd2e2399e58 100644
--- a/src/pages/settings/Agents/AddAgentPage.tsx
+++ b/src/pages/settings/Agents/AddAgentPage.tsx
@@ -65,6 +65,7 @@ function AddAgentPageContent({route, template}: AddAgentPageContentProps) {
     const expensifyIcons = useMemoizedLazyExpensifyIcons(['Pencil']);
     const [avatarDraft, avatarDraftMetadata] = useOnyx(ONYXKEYS.AGENT_NEW_AVATAR_DRAFT);
     const isDraftLoading = isLoadingOnyxValue(avatarDraftMetadata);
+
     // Read here (rather than inside createAgent()) so the write action stays a pure function of its params.
     const [optimisticAgentAccountIDMappingCreatedAt] = useOnyx(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT);
     const hasSubmittedRef = useRef(false);
diff --git a/src/pages/settings/Agents/AgentsPage.tsx b/src/pages/settings/Agents/AgentsPage.tsx
index fdf0e596b322..62f9d0746b18 100644
--- a/src/pages/settings/Agents/AgentsPage.tsx
+++ b/src/pages/settings/Agents/AgentsPage.tsx
@@ -65,6 +65,7 @@ function AgentsPage() {
 
     const [agentPrompts] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT);
     const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
+
     // Read here (rather than inside openAgentsPage()) so the action stays a pure function of its params.
     const [optimisticAgentAccountIDMappingCreatedAt] = useOnyx(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT);
     const personalDetailsList = usePersonalDetails();
@@ -75,6 +76,7 @@ function AgentsPage() {
             return;
         }
         openAgentsPage(optimisticAgentAccountIDMappingCreatedAt);
+
         // Only re-fire OPEN_AGENTS_PAGE when isCustomAgentEnabled changes, not on every mapping update
         // (which happens after each agent creation) — the mapping is read fresh whenever this does run.
         // eslint-disable-next-line react-hooks/exhaustive-deps
diff --git a/src/pages/settings/Agents/EditAgentPage.tsx b/src/pages/settings/Agents/EditAgentPage.tsx
index 4764225e1ef8..970e7e34149c 100644
--- a/src/pages/settings/Agents/EditAgentPage.tsx
+++ b/src/pages/settings/Agents/EditAgentPage.tsx
@@ -41,6 +41,7 @@ function EditAgentPage({route}: EditAgentPageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const icons = useMemoizedLazyExpensifyIcons(['Trashcan', 'ChatBubble', 'Users']);
+
     // Resolve the optimistic accountID to the real one so opening this page mid-CreateAgent (or after a reload) doesn't 404.
     const [accountID, isResolvedAccountIDLoaded] = useResolvedAgentAccountID(route.params.accountID);
     const [agent, agentMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`);
@@ -50,6 +51,7 @@ function EditAgentPage({route}: EditAgentPageProps) {
     const showRuleBotGuardModal = useRuleBotGuardModal();
     const chatWithAgent = useChatWithAgent();
     const switchToDelegator = useSwitchToDelegator();
+
     // Wait for the optimistic->real mapping to load too, so an optimistic accountID that is about to resolve after a
     // reload doesn't briefly flash the not-found page before the mapping is read from storage.
     const isOnyxLoaded = isResolvedAccountIDLoaded && agentMetadata.status === 'loaded' && personalDetailsMetadata.status === 'loaded';
@@ -57,6 +59,7 @@ function EditAgentPage({route}: EditAgentPageProps) {
 
     const agentLogin = personalDetails?.login ?? '';
     const handleBackPress = () => Navigation.goBack();
+
     // Navigate with the raw route accountID (not the resolved one) so the sub-page URL stays consistent with this page's URL and device back doesn't create a duplicate entry.
     const handleEditAvatarPress = () => Navigation.navigate(ROUTES.SETTINGS_AGENTS_EDIT_AVATAR.getRoute(route.params.accountID));
     const handleEditNamePress = () => Navigation.navigate(ROUTES.SETTINGS_AGENTS_EDIT_NAME.getRoute(route.params.accountID));
diff --git a/src/pages/settings/Agents/Fields/EditNamePage.tsx b/src/pages/settings/Agents/Fields/EditNamePage.tsx
index c3fbd99b0af9..70e110c8cfbd 100644
--- a/src/pages/settings/Agents/Fields/EditNamePage.tsx
+++ b/src/pages/settings/Agents/Fields/EditNamePage.tsx
@@ -29,6 +29,7 @@ type EditNamePageProps = PlatformStackScreenProps<SettingsNavigatorParamList, ty
 function EditNamePage({route}: EditNamePageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
+
     // Resolve the optimistic accountID to the real one so opening this page mid-CreateAgent (or after a reload) doesn't 404.
     const [accountID] = useResolvedAgentAccountID(route.params.accountID);
     const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: (list) => list?.[accountID]});
diff --git a/src/pages/settings/Agents/Fields/EditPromptPage.tsx b/src/pages/settings/Agents/Fields/EditPromptPage.tsx
index 455fa55cecfb..3f00ccd88c66 100644
--- a/src/pages/settings/Agents/Fields/EditPromptPage.tsx
+++ b/src/pages/settings/Agents/Fields/EditPromptPage.tsx
@@ -33,6 +33,7 @@ function EditPromptPage({route}: EditPromptPageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const shouldUseScrollableLayout = useIsInLandscapeMode();
+
     // Resolve the optimistic accountID to the real one so opening this page mid-CreateAgent (or after a reload) doesn't 404.
     const [accountID] = useResolvedAgentAccountID(route.params.accountID);
     const [agentPrompt] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`);

From 15b55eb1d0ce381ef048e887ae6410b87a95da99 Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Sat, 22 Aug 2026 13:32:12 +0430
Subject: [PATCH 20/26] Clean up mapping from ProfilePage too

---
 src/pages/ProfilePage.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/pages/ProfilePage.tsx b/src/pages/ProfilePage.tsx
index 91cb93f398bb..cade27d713f4 100755
--- a/src/pages/ProfilePage.tsx
+++ b/src/pages/ProfilePage.tsx
@@ -97,6 +97,9 @@ function ProfilePage({route}: ProfilePageProps) {
     const expensifyIcons = useMemoizedLazyExpensifyIcons(['Bug', 'Pencil', 'Phone', 'UserPlus']);
     const accountID = Number(route.params?.accountID ?? CONST.DEFAULT_NUMBER_ID);
     const [agentPrompt] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`);
+
+    // Read here (rather than inside openAgentsPage()) so the action stays a pure function of its params.
+    const [optimisticAgentAccountIDMappingCreatedAt] = useOnyx(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT);
     const isCurrentUser = currentUserAccountID === accountID;
     const reportID = isCurrentUser ? findSelfDMReportID() : getChatByParticipants(currentUserAccountID ? [accountID, currentUserAccountID] : [], reports)?.reportID;
     const reportKey = isAnonymousUserSession() || !reportID ? (`${ONYXKEYS.COLLECTION.REPORT}0` as const) : (`${ONYXKEYS.COLLECTION.REPORT}${reportID}` as const);
@@ -189,7 +192,11 @@ function ProfilePage({route}: ProfilePageProps) {
         if (isCurrentUser || !isCustomAgent) {
             return;
         }
-        openAgentsPage();
+        openAgentsPage(optimisticAgentAccountIDMappingCreatedAt);
+
+        // Only re-fire OPEN_AGENTS_PAGE when isCurrentUser/isCustomAgent change, not on every mapping update
+        // (which happens after each agent creation) — the mapping is read fresh whenever this does run.
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [isCurrentUser, isCustomAgent]);
 
     const promotedActions: PromotedAction[] = [];

From 185142f40fea94174dc455b67dd0253fa3bdc68e Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Sat, 22 Aug 2026 13:44:34 +0430
Subject: [PATCH 21/26] Backfill missing mapping timestamps

---
 src/hooks/useResolvedAgentAccountID.ts        | 17 ++++++++
 src/libs/actions/Agent.ts                     | 10 +++++
 .../hooks/useResolvedAgentAccountID.test.ts   | 42 +++++++++++++++++++
 3 files changed, 69 insertions(+)

diff --git a/src/hooks/useResolvedAgentAccountID.ts b/src/hooks/useResolvedAgentAccountID.ts
index b29c06a54a3b..f906920d8439 100644
--- a/src/hooks/useResolvedAgentAccountID.ts
+++ b/src/hooks/useResolvedAgentAccountID.ts
@@ -1,5 +1,9 @@
+import {backfillOptimisticAccountIDMappingCreatedAt} from '@libs/actions/Agent';
+
 import ONYXKEYS from '@src/ONYXKEYS';
 
+import {useEffect} from 'react';
+
 import useOnyx from './useOnyx';
 
 /**
@@ -7,11 +11,24 @@ import useOnyx from './useOnyx';
  * `OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING`, so an agent screen opened on the optimistic accountID (even after a reload)
  * shows the real agent instead of "Hmm... it's not here". Persisted because the backend sends the mapping only once.
  *
+ * Also backfills `OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT` for entries this device notices without one — a
+ * mapping entry can arrive via sync from another device/tab that resolved it first, so this device never got the
+ * chance to stamp it itself. Without a timestamp an entry is invisible to createAgent()'s pruning and never expires.
+ *
  * @returns `[resolvedAccountID, isMappingLoaded]` - a not-found screen should wait for `isMappingLoaded` to avoid a
  *          brief not-found flash while the mapping loads. No-op (returns the input) when there's no mapping entry.
  */
 function useResolvedAgentAccountID(routeAccountID: number): [number, boolean] {
     const [realAccountID, mappingMetadata] = useOnyx(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, {selector: (mapping) => mapping?.[routeAccountID]});
+    const [createdAt, createdAtMetadata] = useOnyx(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT, {selector: (mapping) => mapping?.[routeAccountID]});
+
+    useEffect(() => {
+        if (realAccountID === undefined || createdAt !== undefined || createdAtMetadata.status !== 'loaded') {
+            return;
+        }
+        backfillOptimisticAccountIDMappingCreatedAt(routeAccountID);
+    }, [realAccountID, createdAt, createdAtMetadata.status, routeAccountID]);
+
     return [realAccountID ?? routeAccountID, mappingMetadata.status === 'loaded'];
 }
 
diff --git a/src/libs/actions/Agent.ts b/src/libs/actions/Agent.ts
index 36c13279bf12..57a42a547564 100644
--- a/src/libs/actions/Agent.ts
+++ b/src/libs/actions/Agent.ts
@@ -206,6 +206,15 @@ function createAgent(
     return {optimisticAccountID, avatarURI, optimisticReportID};
 }
 
+/**
+ * Backfills a createdAt timestamp for a mapping entry this device notices without one — e.g. one that arrived via
+ * sync from another device/tab that resolved it first, so this device never got the chance to stamp it itself.
+ * Without a timestamp an entry is invisible to createAgent()'s pruning and never expires.
+ */
+function backfillOptimisticAccountIDMappingCreatedAt(optimisticAccountID: number) {
+    Onyx.merge(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT, {[optimisticAccountID]: Date.now()});
+}
+
 /**
  * Stash the template chosen in the "New agent" picker so the custom-agent builder can open pre-filled.
  */
@@ -494,6 +503,7 @@ export {
     openAgentsPage,
     openProfilePage,
     createAgent,
+    backfillOptimisticAccountIDMappingCreatedAt,
     setNewAgentTemplate,
     clearNewAgentTemplate,
     clearAgentError,
diff --git a/tests/unit/hooks/useResolvedAgentAccountID.test.ts b/tests/unit/hooks/useResolvedAgentAccountID.test.ts
index 18d30c30f83a..86ded4240b0d 100644
--- a/tests/unit/hooks/useResolvedAgentAccountID.test.ts
+++ b/tests/unit/hooks/useResolvedAgentAccountID.test.ts
@@ -13,6 +13,18 @@ const REAL_ACCOUNT_ID = 222;
 const OTHER_OPTIMISTIC_ACCOUNT_ID = 999;
 const OTHER_REAL_ACCOUNT_ID = 888;
 
+function getMappingCreatedAt(): Promise<Record<string, number> | undefined> {
+    return new Promise((resolve) => {
+        const connection = Onyx.connectWithoutView({
+            key: ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT,
+            callback: (value) => {
+                Onyx.disconnect(connection);
+                resolve(value ?? undefined);
+            },
+        });
+    });
+}
+
 describe('useResolvedAgentAccountID', () => {
     beforeAll(() => {
         Onyx.init({keys: ONYXKEYS});
@@ -71,4 +83,34 @@ describe('useResolvedAgentAccountID', () => {
             expect(result.current).toEqual([REAL_ACCOUNT_ID, true]);
         });
     });
+
+    it('backfills a createdAt timestamp when a mapping entry has none, so it stays eligible for pruning', async () => {
+        const before = Date.now();
+        await Onyx.set(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, {[OPTIMISTIC_ACCOUNT_ID]: REAL_ACCOUNT_ID});
+        await waitForBatchedUpdates();
+
+        renderHook(() => useResolvedAgentAccountID(OPTIMISTIC_ACCOUNT_ID));
+        await waitForBatchedUpdates();
+        const after = Date.now();
+
+        const createdAtMapping = await getMappingCreatedAt();
+        const createdAtValue = createdAtMapping?.[OPTIMISTIC_ACCOUNT_ID];
+        expect(createdAtValue).toBeGreaterThanOrEqual(before);
+        expect(createdAtValue).toBeLessThanOrEqual(after);
+    });
+
+    it('does not overwrite an existing createdAt timestamp', async () => {
+        const originalCreatedAt = Date.now() - 24 * 60 * 60 * 1000;
+        await Onyx.multiSet({
+            [ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING]: {[OPTIMISTIC_ACCOUNT_ID]: REAL_ACCOUNT_ID},
+            [ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT]: {[OPTIMISTIC_ACCOUNT_ID]: originalCreatedAt},
+        });
+        await waitForBatchedUpdates();
+
+        renderHook(() => useResolvedAgentAccountID(OPTIMISTIC_ACCOUNT_ID));
+        await waitForBatchedUpdates();
+
+        const createdAtMapping = await getMappingCreatedAt();
+        expect(createdAtMapping?.[OPTIMISTIC_ACCOUNT_ID]).toBe(originalCreatedAt);
+    });
 });

From 9d3e1966f9ab1f09e83ef65bb433966174f68cf7 Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Sat, 22 Aug 2026 14:42:28 +0430
Subject: [PATCH 22/26] Combine agent mapping into a derived value

---
 src/ONYXKEYS.ts                               |  2 ++
 src/hooks/useResolvedAgentAccountID.ts        | 22 +++++++-------
 .../OnyxDerived/ONYX_DERIVED_VALUES.ts        |  2 ++
 .../optimisticAgentAccountIDMappingEntries.ts | 28 +++++++++++++++++
 src/types/onyx/DerivedValues.ts               | 16 ++++++++++
 src/types/onyx/index.ts                       |  2 ++
 ...imisticAgentAccountIDMappingEntriesTest.ts | 30 +++++++++++++++++++
 .../hooks/useResolvedAgentAccountID.test.ts   |  4 +++
 8 files changed, 95 insertions(+), 11 deletions(-)
 create mode 100644 src/libs/actions/OnyxDerived/configs/optimisticAgentAccountIDMappingEntries.ts
 create mode 100644 tests/unit/OnyxDerived/optimisticAgentAccountIDMappingEntriesTest.ts

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 81966c9de0db..ee8df94ac8d8 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -1315,6 +1315,7 @@ const ONYXKEYS = {
         CARD_FEED_ERRORS: 'cardFeedErrors',
         RAM_ONLY_SORTED_REPORT_ACTIONS: 'sortedReportActions',
         LOGIN_TO_ACCOUNT_ID_MAP: 'loginToAccountIDMap',
+        OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_ENTRIES: 'optimisticAgentAccountIDMappingEntries',
     },
 
     /** Stores HybridApp specific state required to interoperate with OldDot */
@@ -1846,6 +1847,7 @@ type OnyxDerivedValuesMapping = {
     [ONYXKEYS.DERIVED.CARD_FEED_ERRORS]: OnyxTypes.CardFeedErrorsDerivedValue;
     [ONYXKEYS.DERIVED.RAM_ONLY_SORTED_REPORT_ACTIONS]: OnyxTypes.SortedReportActionsDerivedValue;
     [ONYXKEYS.DERIVED.LOGIN_TO_ACCOUNT_ID_MAP]: OnyxTypes.LoginToAccountIDMapDerivedValue;
+    [ONYXKEYS.DERIVED.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_ENTRIES]: OnyxTypes.OptimisticAgentAccountIDMappingEntriesDerivedValue;
 };
 
 type OnyxValues = OnyxValuesMapping & OnyxCollectionValuesMapping & OnyxFormValuesMapping & OnyxFormDraftValuesMapping & OnyxDerivedValuesMapping;
diff --git a/src/hooks/useResolvedAgentAccountID.ts b/src/hooks/useResolvedAgentAccountID.ts
index f906920d8439..be2f944a0f9b 100644
--- a/src/hooks/useResolvedAgentAccountID.ts
+++ b/src/hooks/useResolvedAgentAccountID.ts
@@ -7,29 +7,29 @@ import {useEffect} from 'react';
 import useOnyx from './useOnyx';
 
 /**
- * Resolves an agent's optimistic accountID to the real one CreateAgent assigns, via the persisted
- * `OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING`, so an agent screen opened on the optimistic accountID (even after a reload)
- * shows the real agent instead of "Hmm... it's not here". Persisted because the backend sends the mapping only once.
+ * Resolves an agent's optimistic accountID to the real one CreateAgent assigns, via the derived
+ * `OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_ENTRIES` (combining the mapping and its createdAt timestamp into one
+ * always-in-sync source), so an agent screen opened on the optimistic accountID (even after a reload) shows the
+ * real agent instead of "Hmm... it's not here".
  *
- * Also backfills `OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT` for entries this device notices without one — a
- * mapping entry can arrive via sync from another device/tab that resolved it first, so this device never got the
- * chance to stamp it itself. Without a timestamp an entry is invisible to createAgent()'s pruning and never expires.
+ * Also backfills a missing `createdAt` for entries this device notices without one — a mapping entry can arrive
+ * via sync from another device/tab that resolved it first, so this device never got the chance to stamp it
+ * itself. Without a timestamp an entry is invisible to createAgent()'s pruning and never expires.
  *
  * @returns `[resolvedAccountID, isMappingLoaded]` - a not-found screen should wait for `isMappingLoaded` to avoid a
  *          brief not-found flash while the mapping loads. No-op (returns the input) when there's no mapping entry.
  */
 function useResolvedAgentAccountID(routeAccountID: number): [number, boolean] {
-    const [realAccountID, mappingMetadata] = useOnyx(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, {selector: (mapping) => mapping?.[routeAccountID]});
-    const [createdAt, createdAtMetadata] = useOnyx(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT, {selector: (mapping) => mapping?.[routeAccountID]});
+    const [entry, entryMetadata] = useOnyx(ONYXKEYS.DERIVED.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_ENTRIES, {selector: (entries) => entries?.[routeAccountID]});
 
     useEffect(() => {
-        if (realAccountID === undefined || createdAt !== undefined || createdAtMetadata.status !== 'loaded') {
+        if (entry?.realAccountID === undefined || entry.createdAt !== undefined || entryMetadata.status !== 'loaded') {
             return;
         }
         backfillOptimisticAccountIDMappingCreatedAt(routeAccountID);
-    }, [realAccountID, createdAt, createdAtMetadata.status, routeAccountID]);
+    }, [entry?.realAccountID, entry?.createdAt, entryMetadata.status, routeAccountID]);
 
-    return [realAccountID ?? routeAccountID, mappingMetadata.status === 'loaded'];
+    return [entry?.realAccountID ?? routeAccountID, entryMetadata.status === 'loaded'];
 }
 
 export default useResolvedAgentAccountID;
diff --git a/src/libs/actions/OnyxDerived/ONYX_DERIVED_VALUES.ts b/src/libs/actions/OnyxDerived/ONYX_DERIVED_VALUES.ts
index d01744852e4f..673bdb1174d0 100644
--- a/src/libs/actions/OnyxDerived/ONYX_DERIVED_VALUES.ts
+++ b/src/libs/actions/OnyxDerived/ONYX_DERIVED_VALUES.ts
@@ -7,6 +7,7 @@ import type {OnyxDerivedValueConfig} from './types';
 import cardFeedErrorsConfig from './configs/cardFeedErrors';
 import loginToAccountIDMapConfig from './configs/loginToAccountIDMap';
 import nonPersonalAndWorkspaceCardListConfig from './configs/nonPersonalAndWorkspaceCardList';
+import optimisticAgentAccountIDMappingEntriesConfig from './configs/optimisticAgentAccountIDMappingEntries';
 import outstandingReportsByPolicyIDConfig from './configs/outstandingReportsByPolicyID';
 import personalAndWorkspaceCardListConfig from './configs/personalAndWorkspaceCardList';
 import reportAttributesConfig from './configs/reportAttributes';
@@ -28,6 +29,7 @@ const ONYX_DERIVED_VALUES = {
     [ONYXKEYS.DERIVED.CARD_FEED_ERRORS]: cardFeedErrorsConfig,
     [ONYXKEYS.DERIVED.RAM_ONLY_SORTED_REPORT_ACTIONS]: sortedReportActionsConfig,
     [ONYXKEYS.DERIVED.LOGIN_TO_ACCOUNT_ID_MAP]: loginToAccountIDMapConfig,
+    [ONYXKEYS.DERIVED.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_ENTRIES]: optimisticAgentAccountIDMappingEntriesConfig,
 } as const satisfies {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     [Key in ValueOf<typeof ONYXKEYS.DERIVED>]: OnyxDerivedValueConfig<Key, any>;
diff --git a/src/libs/actions/OnyxDerived/configs/optimisticAgentAccountIDMappingEntries.ts b/src/libs/actions/OnyxDerived/configs/optimisticAgentAccountIDMappingEntries.ts
new file mode 100644
index 000000000000..e565815e40c6
--- /dev/null
+++ b/src/libs/actions/OnyxDerived/configs/optimisticAgentAccountIDMappingEntries.ts
@@ -0,0 +1,28 @@
+import createOnyxDerivedValueConfig from '@userActions/OnyxDerived/createOnyxDerivedValueConfig';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {OptimisticAgentAccountIDMappingEntriesDerivedValue} from '@src/types/onyx';
+
+/**
+ * Combines OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING (backend-owned) and OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT
+ * (client-owned) into one key per optimistic accountID, so consumers read a single always-in-sync source instead
+ * of two parallel keys that would otherwise have to be kept manually in lockstep.
+ */
+export default createOnyxDerivedValueConfig({
+    key: ONYXKEYS.DERIVED.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_ENTRIES,
+    dependencies: [ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT],
+    compute: ([mapping, createdAtByOptimisticAccountID]) => {
+        if (!mapping) {
+            return {};
+        }
+
+        const entries: OptimisticAgentAccountIDMappingEntriesDerivedValue = {};
+        for (const [optimisticAccountID, realAccountID] of Object.entries(mapping)) {
+            if (realAccountID === undefined) {
+                continue;
+            }
+            entries[optimisticAccountID] = {realAccountID, createdAt: createdAtByOptimisticAccountID?.[optimisticAccountID]};
+        }
+        return entries;
+    },
+});
diff --git a/src/types/onyx/DerivedValues.ts b/src/types/onyx/DerivedValues.ts
index 6ffea17b53e7..e3566195b65f 100644
--- a/src/types/onyx/DerivedValues.ts
+++ b/src/types/onyx/DerivedValues.ts
@@ -264,6 +264,21 @@ type PersonalAndWorkspaceCardListDerivedValue = CardList;
  */
 type LoginToAccountIDMapDerivedValue = Record<string, number>;
 
+/** One combined entry in OptimisticAgentAccountIDMappingEntriesDerivedValue. */
+type OptimisticAgentAccountIDMappingEntry = {
+    /** The real accountID CreateAgent assigned for this optimistic accountID. */
+    realAccountID: number;
+
+    /** When this entry was noticed locally, in ms since epoch. Undefined until the local stamp/backfill lands. */
+    createdAt: number | undefined;
+};
+
+/**
+ * Combines OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING and OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT into one
+ * key per optimistic accountID, so consumers read a single always-in-sync source instead of two parallel keys.
+ */
+type OptimisticAgentAccountIDMappingEntriesDerivedValue = Record<string, OptimisticAgentAccountIDMappingEntry>;
+
 export type {
     ReportAttributes,
     ReportAttributesDerivedValue,
@@ -276,6 +291,7 @@ export type {
     PersonalAndWorkspaceCardListDerivedValue,
     CardFeedErrorsDerivedValue,
     LoginToAccountIDMapDerivedValue,
+    OptimisticAgentAccountIDMappingEntriesDerivedValue,
     CardFeedErrorsObject,
     CardFeedErrorState,
     CardFeedErrors,
diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts
index bca4b662e0b0..985de1d40d8f 100644
--- a/src/types/onyx/index.ts
+++ b/src/types/onyx/index.ts
@@ -58,6 +58,7 @@ import type {
     CardFeedErrorsDerivedValue,
     LoginToAccountIDMapDerivedValue,
     NonPersonalAndWorkspaceCardListDerivedValue,
+    OptimisticAgentAccountIDMappingEntriesDerivedValue,
     OutstandingReportsByPolicyIDDerivedValue,
     PersonalAndWorkspaceCardListDerivedValue,
     ReportAttributesDerivedValue,
@@ -424,6 +425,7 @@ export type {
     PersonalAndWorkspaceCardListDerivedValue,
     CardFeedErrorsDerivedValue,
     LoginToAccountIDMapDerivedValue,
+    OptimisticAgentAccountIDMappingEntriesDerivedValue,
     ScheduleCallDraft,
     ValidateUserAndGetAccessiblePolicies,
     VacationDelegate,
diff --git a/tests/unit/OnyxDerived/optimisticAgentAccountIDMappingEntriesTest.ts b/tests/unit/OnyxDerived/optimisticAgentAccountIDMappingEntriesTest.ts
new file mode 100644
index 000000000000..fbce74ad568b
--- /dev/null
+++ b/tests/unit/OnyxDerived/optimisticAgentAccountIDMappingEntriesTest.ts
@@ -0,0 +1,30 @@
+import optimisticAgentAccountIDMappingEntriesConfig from '@libs/actions/OnyxDerived/configs/optimisticAgentAccountIDMappingEntries';
+
+describe('optimisticAgentAccountIDMappingEntries', () => {
+    const optimisticAccountID = '111';
+    const realAccountID = 222;
+    const createdAt = 1700000000000;
+
+    it('returns an empty object when there is no mapping', () => {
+        expect(optimisticAgentAccountIDMappingEntriesConfig.compute([undefined, undefined], {})).toEqual({});
+    });
+
+    it('combines a mapping entry with its createdAt timestamp', () => {
+        const result = optimisticAgentAccountIDMappingEntriesConfig.compute([{[optimisticAccountID]: realAccountID}, {[optimisticAccountID]: createdAt}], {});
+
+        expect(result).toEqual({[optimisticAccountID]: {realAccountID, createdAt}});
+    });
+
+    it('leaves createdAt undefined when the timestamp has not arrived yet', () => {
+        const result = optimisticAgentAccountIDMappingEntriesConfig.compute([{[optimisticAccountID]: realAccountID}, undefined], {});
+
+        expect(result).toEqual({[optimisticAccountID]: {realAccountID, createdAt: undefined}});
+    });
+
+    it('ignores a createdAt entry for an accountID with no mapping entry', () => {
+        const otherOptimisticAccountID = '999';
+        const result = optimisticAgentAccountIDMappingEntriesConfig.compute([{[optimisticAccountID]: realAccountID}, {[otherOptimisticAccountID]: createdAt}], {});
+
+        expect(result).toEqual({[optimisticAccountID]: {realAccountID, createdAt: undefined}});
+    });
+});
diff --git a/tests/unit/hooks/useResolvedAgentAccountID.test.ts b/tests/unit/hooks/useResolvedAgentAccountID.test.ts
index 86ded4240b0d..2d69184ef5dd 100644
--- a/tests/unit/hooks/useResolvedAgentAccountID.test.ts
+++ b/tests/unit/hooks/useResolvedAgentAccountID.test.ts
@@ -2,6 +2,8 @@ import {renderHook, waitFor} from '@testing-library/react-native';
 
 import useResolvedAgentAccountID from '@hooks/useResolvedAgentAccountID';
 
+import initOnyxDerivedValues from '@userActions/OnyxDerived';
+
 import ONYXKEYS from '@src/ONYXKEYS';
 
 import Onyx from 'react-native-onyx';
@@ -28,6 +30,8 @@ function getMappingCreatedAt(): Promise<Record<string, number> | undefined> {
 describe('useResolvedAgentAccountID', () => {
     beforeAll(() => {
         Onyx.init({keys: ONYXKEYS});
+        initOnyxDerivedValues();
+        return waitForBatchedUpdates();
     });
 
     beforeEach(async () => {

From 412c328162581f41107e0c58045b5aaf75803073 Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Sat, 22 Aug 2026 15:11:39 +0430
Subject: [PATCH 23/26] Use OnyxUtils.get instead of connectWithoutView in test

---
 tests/unit/hooks/useResolvedAgentAccountID.test.ts | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/tests/unit/hooks/useResolvedAgentAccountID.test.ts b/tests/unit/hooks/useResolvedAgentAccountID.test.ts
index 2d69184ef5dd..2b78baa0a58a 100644
--- a/tests/unit/hooks/useResolvedAgentAccountID.test.ts
+++ b/tests/unit/hooks/useResolvedAgentAccountID.test.ts
@@ -7,6 +7,7 @@ import initOnyxDerivedValues from '@userActions/OnyxDerived';
 import ONYXKEYS from '@src/ONYXKEYS';
 
 import Onyx from 'react-native-onyx';
+import OnyxUtils from 'react-native-onyx/dist/OnyxUtils';
 
 import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates';
 
@@ -16,15 +17,7 @@ const OTHER_OPTIMISTIC_ACCOUNT_ID = 999;
 const OTHER_REAL_ACCOUNT_ID = 888;
 
 function getMappingCreatedAt(): Promise<Record<string, number> | undefined> {
-    return new Promise((resolve) => {
-        const connection = Onyx.connectWithoutView({
-            key: ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT,
-            callback: (value) => {
-                Onyx.disconnect(connection);
-                resolve(value ?? undefined);
-            },
-        });
-    });
+    return OnyxUtils.get(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT);
 }
 
 describe('useResolvedAgentAccountID', () => {

From d4a61f69a962f177fac9c7a23a00c5f907e31ff8 Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Thu, 27 Aug 2026 09:24:30 +0430
Subject: [PATCH 24/26] Trim comment

---
 src/hooks/useResolvedAgentAccountID.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/hooks/useResolvedAgentAccountID.ts b/src/hooks/useResolvedAgentAccountID.ts
index be2f944a0f9b..11ae2d4e956a 100644
--- a/src/hooks/useResolvedAgentAccountID.ts
+++ b/src/hooks/useResolvedAgentAccountID.ts
@@ -12,9 +12,8 @@ import useOnyx from './useOnyx';
  * always-in-sync source), so an agent screen opened on the optimistic accountID (even after a reload) shows the
  * real agent instead of "Hmm... it's not here".
  *
- * Also backfills a missing `createdAt` for entries this device notices without one — a mapping entry can arrive
- * via sync from another device/tab that resolved it first, so this device never got the chance to stamp it
- * itself. Without a timestamp an entry is invisible to createAgent()'s pruning and never expires.
+ * Without a stamped `createdAt`, an entry is invisible to createAgent()'s pruning and never expires — this can
+ * happen when the mapping arrives via sync from another device/tab that resolved it first.
  *
  * @returns `[resolvedAccountID, isMappingLoaded]` - a not-found screen should wait for `isMappingLoaded` to avoid a
  *          brief not-found flash while the mapping loads. No-op (returns the input) when there's no mapping entry.

From a0579331004946a9951deb6dc7cf5ebd0555bbed Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Thu, 27 Aug 2026 09:25:15 +0430
Subject: [PATCH 25/26] split max-age constant into days

---
 src/libs/actions/Agent.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/Agent.ts b/src/libs/actions/Agent.ts
index 57a42a547564..8bab07eeefc5 100644
--- a/src/libs/actions/Agent.ts
+++ b/src/libs/actions/Agent.ts
@@ -21,7 +21,8 @@ import type {OnyxCollection, OnyxCollectionInputValue, OnyxEntry, OnyxUpdate} fr
 
 import Onyx from 'react-native-onyx';
 
-const OPTIMISTIC_ACCOUNT_ID_MAPPING_MAX_AGE_MS = 30 * 24 * 60 * 60 * 1000;
+const OPTIMISTIC_ACCOUNT_ID_MAPPING_MAX_AGE_IN_DAYS = 30;
+const OPTIMISTIC_ACCOUNT_ID_MAPPING_MAX_AGE_MS = OPTIMISTIC_ACCOUNT_ID_MAPPING_MAX_AGE_IN_DAYS * 24 * 60 * 60 * 1000;
 
 // Called from both createAgent() and openAgentsPage() (the two points that have this data on hand) instead of a
 // boot-time sweep, to avoid adding a new Onyx.connectWithoutView subscription.

From e7b919332473471b940bc049f9de3c1ac5279472 Mon Sep 17 00:00:00 2001
From: Nabi <nabi.zarin.work@gmail.com>
Date: Thu, 27 Aug 2026 10:32:11 +0430
Subject: [PATCH 26/26] Read agent mapping via connectWithoutView, fix resolve
 race

---
 src/hooks/useResolvedAgentAccountID.ts        | 20 +++++----
 src/libs/actions/Agent.ts                     | 22 +++++----
 src/pages/ProfilePage.tsx                     |  9 +---
 src/pages/settings/Agents/AddAgentPage.tsx    | 27 +----------
 src/pages/settings/Agents/AgentsPage.tsx      |  9 +---
 tests/unit/AgentActionTest.ts                 | 45 +++++++++++++------
 .../hooks/useResolvedAgentAccountID.test.ts   | 14 ++++++
 .../unit/pages/settings/AddAgentPageTest.tsx  |  6 +--
 8 files changed, 78 insertions(+), 74 deletions(-)

diff --git a/src/hooks/useResolvedAgentAccountID.ts b/src/hooks/useResolvedAgentAccountID.ts
index 11ae2d4e956a..869925822dba 100644
--- a/src/hooks/useResolvedAgentAccountID.ts
+++ b/src/hooks/useResolvedAgentAccountID.ts
@@ -7,10 +7,13 @@ import {useEffect} from 'react';
 import useOnyx from './useOnyx';
 
 /**
- * Resolves an agent's optimistic accountID to the real one CreateAgent assigns, via the derived
- * `OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_ENTRIES` (combining the mapping and its createdAt timestamp into one
- * always-in-sync source), so an agent screen opened on the optimistic accountID (even after a reload) shows the
- * real agent instead of "Hmm... it's not here".
+ * Resolves an agent's optimistic accountID to the real one CreateAgent assigns, via the persisted
+ * `OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING`, so an agent screen opened on the optimistic accountID (even after a reload)
+ * shows the real agent instead of "Hmm... it's not here".
+ *
+ * The derived `OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_ENTRIES` defers its first compute until all its dependency
+ * connections are established, which can briefly lag behind the raw key on a cold cache — long enough to flash a
+ * not-found page in between. It's still used for `createdAt` below, which has no such timing sensitivity.
  *
  * Without a stamped `createdAt`, an entry is invisible to createAgent()'s pruning and never expires — this can
  * happen when the mapping arrives via sync from another device/tab that resolved it first.
@@ -19,16 +22,17 @@ import useOnyx from './useOnyx';
  *          brief not-found flash while the mapping loads. No-op (returns the input) when there's no mapping entry.
  */
 function useResolvedAgentAccountID(routeAccountID: number): [number, boolean] {
-    const [entry, entryMetadata] = useOnyx(ONYXKEYS.DERIVED.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_ENTRIES, {selector: (entries) => entries?.[routeAccountID]});
+    const [realAccountID, mappingMetadata] = useOnyx(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, {selector: (mapping) => mapping?.[routeAccountID]});
+    const [createdAt, createdAtMetadata] = useOnyx(ONYXKEYS.DERIVED.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_ENTRIES, {selector: (entries) => entries?.[routeAccountID]?.createdAt});
 
     useEffect(() => {
-        if (entry?.realAccountID === undefined || entry.createdAt !== undefined || entryMetadata.status !== 'loaded') {
+        if (realAccountID === undefined || createdAt !== undefined || createdAtMetadata.status !== 'loaded') {
             return;
         }
         backfillOptimisticAccountIDMappingCreatedAt(routeAccountID);
-    }, [entry?.realAccountID, entry?.createdAt, entryMetadata.status, routeAccountID]);
+    }, [realAccountID, createdAt, createdAtMetadata.status, routeAccountID]);
 
-    return [entry?.realAccountID ?? routeAccountID, entryMetadata.status === 'loaded'];
+    return [realAccountID ?? routeAccountID, mappingMetadata.status === 'loaded'];
 }
 
 export default useResolvedAgentAccountID;
diff --git a/src/libs/actions/Agent.ts b/src/libs/actions/Agent.ts
index 8bab07eeefc5..c1e0ee460270 100644
--- a/src/libs/actions/Agent.ts
+++ b/src/libs/actions/Agent.ts
@@ -24,11 +24,18 @@ import Onyx from 'react-native-onyx';
 const OPTIMISTIC_ACCOUNT_ID_MAPPING_MAX_AGE_IN_DAYS = 30;
 const OPTIMISTIC_ACCOUNT_ID_MAPPING_MAX_AGE_MS = OPTIMISTIC_ACCOUNT_ID_MAPPING_MAX_AGE_IN_DAYS * 24 * 60 * 60 * 1000;
 
-// Called from both createAgent() and openAgentsPage() (the two points that have this data on hand) instead of a
-// boot-time sweep, to avoid adding a new Onyx.connectWithoutView subscription.
-function getStaleOptimisticAccountIDMappingUpdates(existingOptimisticAccountIDMappingCreatedAt: OnyxEntry<OptimisticAgentAccountIDMappingCreatedAt>): AnyOnyxUpdate[] {
+// Non-React file, so it reads its own data here instead of via useOnyx + a param (same pattern as HandleUnusedOptimisticID.ts).
+let optimisticAccountIDMappingCreatedAt: OnyxEntry<OptimisticAgentAccountIDMappingCreatedAt>;
+Onyx.connectWithoutView({
+    key: ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT,
+    callback: (value) => {
+        optimisticAccountIDMappingCreatedAt = value;
+    },
+});
+
+function getStaleOptimisticAccountIDMappingUpdates(): AnyOnyxUpdate[] {
     const now = Date.now();
-    const staleOptimisticAccountIDs = Object.entries(existingOptimisticAccountIDMappingCreatedAt ?? {})
+    const staleOptimisticAccountIDs = Object.entries(optimisticAccountIDMappingCreatedAt ?? {})
         .filter(([, createdAt]) => now - createdAt > OPTIMISTIC_ACCOUNT_ID_MAPPING_MAX_AGE_MS)
         .map(([staleOptimisticAccountID]) => staleOptimisticAccountID);
 
@@ -43,7 +50,7 @@ function getStaleOptimisticAccountIDMappingUpdates(existingOptimisticAccountIDMa
     ];
 }
 
-function openAgentsPage(existingOptimisticAccountIDMappingCreatedAt?: OnyxEntry<OptimisticAgentAccountIDMappingCreatedAt>) {
+function openAgentsPage() {
     const finallyData: AnyOnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -52,7 +59,7 @@ function openAgentsPage(existingOptimisticAccountIDMappingCreatedAt?: OnyxEntry<
         },
     ];
 
-    const optimisticData = getStaleOptimisticAccountIDMappingUpdates(existingOptimisticAccountIDMappingCreatedAt);
+    const optimisticData = getStaleOptimisticAccountIDMappingUpdates();
 
     read(READ_COMMANDS.OPEN_AGENTS_PAGE, null, {optimisticData, finallyData});
 }
@@ -70,7 +77,6 @@ function createAgent(
     file?: File | CustomRNImageManipulatorResult,
     optimisticAvatarURI?: string,
     policyID?: string,
-    existingOptimisticAccountIDMappingCreatedAt?: OnyxEntry<OptimisticAgentAccountIDMappingCreatedAt>,
 ) {
     const optimisticAccountID = Number(generateReportID());
 
@@ -131,7 +137,7 @@ function createAgent(
             key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${optimisticReportID}`,
             value: {isOptimisticReport: true},
         },
-        ...getStaleOptimisticAccountIDMappingUpdates(existingOptimisticAccountIDMappingCreatedAt),
+        ...getStaleOptimisticAccountIDMappingUpdates(),
     ];
 
     const successData: AnyOnyxUpdate[] = [
diff --git a/src/pages/ProfilePage.tsx b/src/pages/ProfilePage.tsx
index 4623ce9bba4d..1986f238d601 100755
--- a/src/pages/ProfilePage.tsx
+++ b/src/pages/ProfilePage.tsx
@@ -97,9 +97,6 @@ function ProfilePage({route}: ProfilePageProps) {
     const expensifyIcons = useMemoizedLazyExpensifyIcons(['Bug', 'Pencil', 'Phone', 'UserPlus']);
     const accountID = Number(route.params?.accountID ?? CONST.DEFAULT_NUMBER_ID);
     const [agentPrompt] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`);
-
-    // Read here (rather than inside openAgentsPage()) so the action stays a pure function of its params.
-    const [optimisticAgentAccountIDMappingCreatedAt] = useOnyx(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT);
     const isCurrentUser = currentUserAccountID === accountID;
     const reportID = isCurrentUser ? findSelfDMReportID() : getChatByParticipants(currentUserAccountID ? [accountID, currentUserAccountID] : [], reports)?.reportID;
     const reportKey = isAnonymousUserSession() || !reportID ? (`${ONYXKEYS.COLLECTION.REPORT}0` as const) : (`${ONYXKEYS.COLLECTION.REPORT}${reportID}` as const);
@@ -192,11 +189,7 @@ function ProfilePage({route}: ProfilePageProps) {
         if (isCurrentUser || !isCustomAgent) {
             return;
         }
-        openAgentsPage(optimisticAgentAccountIDMappingCreatedAt);
-
-        // Only re-fire OPEN_AGENTS_PAGE when isCurrentUser/isCustomAgent change, not on every mapping update
-        // (which happens after each agent creation) — the mapping is read fresh whenever this does run.
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        openAgentsPage();
     }, [isCurrentUser, isCustomAgent]);
 
     const promotedActions: PromotedAction[] = [];
diff --git a/src/pages/settings/Agents/AddAgentPage.tsx b/src/pages/settings/Agents/AddAgentPage.tsx
index 0fd2e2399e58..16a8d2faad0d 100644
--- a/src/pages/settings/Agents/AddAgentPage.tsx
+++ b/src/pages/settings/Agents/AddAgentPage.tsx
@@ -65,9 +65,6 @@ function AddAgentPageContent({route, template}: AddAgentPageContentProps) {
     const expensifyIcons = useMemoizedLazyExpensifyIcons(['Pencil']);
     const [avatarDraft, avatarDraftMetadata] = useOnyx(ONYXKEYS.AGENT_NEW_AVATAR_DRAFT);
     const isDraftLoading = isLoadingOnyxValue(avatarDraftMetadata);
-
-    // Read here (rather than inside createAgent()) so the write action stays a pure function of its params.
-    const [optimisticAgentAccountIDMappingCreatedAt] = useOnyx(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT);
     const hasSubmittedRef = useRef(false);
     const formRef = useRef<FormRef>(null);
 
@@ -134,28 +131,8 @@ function AddAgentPageContent({route, template}: AddAgentPageContentProps) {
         // reportID it generates client-side, and CreateAgent creates the DM under that exact ID (see
         // CreateAgent.cpp), so we can navigate to the DM immediately, online or offline, without waiting.
         const {optimisticReportID} = uploadedAvatar?.uri
-            ? createAgent(
-                  firstName,
-                  prompt,
-                  ownerAccountID,
-                  ownerLogin,
-                  undefined,
-                  buildFileFromAvatarCropResult(uploadedAvatar),
-                  uploadedAvatar.uri,
-                  policyID,
-                  optimisticAgentAccountIDMappingCreatedAt,
-              )
-            : createAgent(
-                  firstName,
-                  prompt,
-                  ownerAccountID,
-                  ownerLogin,
-                  selectedPresetID ?? AGENT_AVATARS.getRandomID(),
-                  undefined,
-                  undefined,
-                  policyID,
-                  optimisticAgentAccountIDMappingCreatedAt,
-              );
+            ? createAgent(firstName, prompt, ownerAccountID, ownerLogin, undefined, buildFileFromAvatarCropResult(uploadedAvatar), uploadedAvatar.uri, policyID)
+            : createAgent(firstName, prompt, ownerAccountID, ownerLogin, selectedPresetID ?? AGENT_AVATARS.getRandomID(), undefined, undefined, policyID);
 
         clearNewAgentTemplate();
         clearNewAgentAvatarDraft();
diff --git a/src/pages/settings/Agents/AgentsPage.tsx b/src/pages/settings/Agents/AgentsPage.tsx
index 6712c029a849..170f7ebf5aef 100644
--- a/src/pages/settings/Agents/AgentsPage.tsx
+++ b/src/pages/settings/Agents/AgentsPage.tsx
@@ -66,9 +66,6 @@ function AgentsPage() {
 
     const [agentPrompts] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT);
     const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
-
-    // Read here (rather than inside openAgentsPage()) so the action stays a pure function of its params.
-    const [optimisticAgentAccountIDMappingCreatedAt] = useOnyx(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT);
     const personalDetailsList = usePersonalDetails();
     const canSelectMultiple = shouldUseNarrowLayout ? isMobileSelectionModeEnabled : true;
 
@@ -76,11 +73,7 @@ function AgentsPage() {
         if (!isCustomAgentEnabled) {
             return;
         }
-        openAgentsPage(optimisticAgentAccountIDMappingCreatedAt);
-
-        // Only re-fire OPEN_AGENTS_PAGE when isCustomAgentEnabled changes, not on every mapping update
-        // (which happens after each agent creation) — the mapping is read fresh whenever this does run.
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        openAgentsPage();
     }, [isCustomAgentEnabled]);
 
     const handleErrorClose = (pendingAction: PendingAction | null | undefined, accountID: number) => {
diff --git a/tests/unit/AgentActionTest.ts b/tests/unit/AgentActionTest.ts
index 86ac1c3f89fd..f96525059c86 100644
--- a/tests/unit/AgentActionTest.ts
+++ b/tests/unit/AgentActionTest.ts
@@ -16,6 +16,7 @@ import Onyx from 'react-native-onyx';
 
 import createRandomPolicy from '../utils/collections/policies';
 import createMock from '../utils/createMock';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 
 jest.mock('@libs/API');
 jest.mock('@libs/Navigation/Navigation', () => ({navigate: jest.fn(), goBack: jest.fn()}));
@@ -105,9 +106,15 @@ const OWNER_LOGIN = 'owner@test.com';
 const STALE_OPTIMISTIC_ACCOUNT_ID = 111;
 const FRESH_OPTIMISTIC_ACCOUNT_ID = 222;
 
+beforeAll(() => {
+    Onyx.init({keys: ONYXKEYS});
+});
+
 describe('createAgent', () => {
-    beforeEach(() => {
+    beforeEach(async () => {
         jest.clearAllMocks();
+        await Onyx.set(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT, null);
+        await waitForBatchedUpdates();
     });
 
     it('calls write with CREATE_AGENT command and provided params', () => {
@@ -404,14 +411,15 @@ describe('createAgent', () => {
         expect(createdAtValue).toBeLessThanOrEqual(after);
     });
 
-    it('prunes mapping entries older than 30 days, keeping fresher ones', () => {
+    it('prunes mapping entries older than 30 days, keeping fresher ones', async () => {
         const now = Date.now();
-        const existingCreatedAt = {
+        await Onyx.set(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT, {
             [STALE_OPTIMISTIC_ACCOUNT_ID]: now - 31 * 24 * 60 * 60 * 1000,
             [FRESH_OPTIMISTIC_ACCOUNT_ID]: now - 1 * 24 * 60 * 60 * 1000,
-        };
+        });
+        await waitForBatchedUpdates();
 
-        createAgent('Bot', 'My prompt', OWNER_ACCOUNT_ID, OWNER_LOGIN, undefined, undefined, undefined, undefined, existingCreatedAt);
+        createAgent('Bot', 'My prompt', OWNER_ACCOUNT_ID, OWNER_LOGIN);
 
         const {optimisticData} = getWriteOptions();
         const mappingPrune = getUpdateRecord(optimisticData, ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING);
@@ -423,8 +431,11 @@ describe('createAgent', () => {
         expect(timestampPrune[FRESH_OPTIMISTIC_ACCOUNT_ID]).toBeUndefined();
     });
 
-    it('does not write mapping prune updates when nothing is stale', () => {
-        createAgent('Bot', 'My prompt', OWNER_ACCOUNT_ID, OWNER_LOGIN, undefined, undefined, undefined, undefined, {[FRESH_OPTIMISTIC_ACCOUNT_ID]: Date.now() - 24 * 60 * 60 * 1000});
+    it('does not write mapping prune updates when nothing is stale', async () => {
+        await Onyx.set(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT, {[FRESH_OPTIMISTIC_ACCOUNT_ID]: Date.now() - 24 * 60 * 60 * 1000});
+        await waitForBatchedUpdates();
+
+        createAgent('Bot', 'My prompt', OWNER_ACCOUNT_ID, OWNER_LOGIN);
 
         const {optimisticData} = getWriteOptions();
         expect(findUpdate(optimisticData, ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING)).toBeUndefined();
@@ -439,8 +450,10 @@ describe('createAgent', () => {
 });
 
 describe('openAgentsPage', () => {
-    beforeEach(() => {
+    beforeEach(async () => {
         jest.clearAllMocks();
+        await Onyx.set(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT, null);
+        await waitForBatchedUpdates();
     });
 
     it('calls read with OPEN_AGENTS_PAGE command', () => {
@@ -456,14 +469,15 @@ describe('openAgentsPage', () => {
         expect(findUpdate(finallyData, ONYXKEYS.ARE_AGENTS_LOADED)?.value).toBe(true);
     });
 
-    it('prunes mapping entries older than 30 days, keeping fresher ones', () => {
+    it('prunes mapping entries older than 30 days, keeping fresher ones', async () => {
         const now = Date.now();
-        const existingCreatedAt = {
+        await Onyx.set(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT, {
             [STALE_OPTIMISTIC_ACCOUNT_ID]: now - 31 * 24 * 60 * 60 * 1000,
             [FRESH_OPTIMISTIC_ACCOUNT_ID]: now - 1 * 24 * 60 * 60 * 1000,
-        };
+        });
+        await waitForBatchedUpdates();
 
-        openAgentsPage(existingCreatedAt);
+        openAgentsPage();
 
         const {optimisticData} = getReadOptions();
         const mappingPrune = getUpdateRecord(optimisticData, ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING);
@@ -474,8 +488,11 @@ describe('openAgentsPage', () => {
         expect(timestampPrune[STALE_OPTIMISTIC_ACCOUNT_ID]).toBeNull();
     });
 
-    it('does not write mapping prune updates when nothing is stale', () => {
-        openAgentsPage({[FRESH_OPTIMISTIC_ACCOUNT_ID]: Date.now() - 24 * 60 * 60 * 1000});
+    it('does not write mapping prune updates when nothing is stale', async () => {
+        await Onyx.set(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_CREATED_AT, {[FRESH_OPTIMISTIC_ACCOUNT_ID]: Date.now() - 24 * 60 * 60 * 1000});
+        await waitForBatchedUpdates();
+
+        openAgentsPage();
 
         const {optimisticData} = getReadOptions();
         expect(findUpdate(optimisticData, ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING)).toBeUndefined();
diff --git a/tests/unit/hooks/useResolvedAgentAccountID.test.ts b/tests/unit/hooks/useResolvedAgentAccountID.test.ts
index 2b78baa0a58a..9274e474ddbf 100644
--- a/tests/unit/hooks/useResolvedAgentAccountID.test.ts
+++ b/tests/unit/hooks/useResolvedAgentAccountID.test.ts
@@ -96,6 +96,20 @@ describe('useResolvedAgentAccountID', () => {
         expect(createdAtValue).toBeLessThanOrEqual(after);
     });
 
+    it('resolves and reports loaded from the raw mapping even when the derived entries value has not caught up yet', async () => {
+        // Simulates the derived engine's compute lagging behind the raw key on a cold cache (see the comment on
+        // the hook) — resolution must not depend on OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_ENTRIES being current.
+        await Onyx.set(ONYXKEYS.DERIVED.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING_ENTRIES, {});
+        await Onyx.set(ONYXKEYS.OPTIMISTIC_AGENT_ACCOUNT_ID_MAPPING, {[OPTIMISTIC_ACCOUNT_ID]: REAL_ACCOUNT_ID});
+        await waitForBatchedUpdates();
+
+        const {result} = renderHook(() => useResolvedAgentAccountID(OPTIMISTIC_ACCOUNT_ID));
+
+        await waitFor(() => {
+            expect(result.current).toEqual([REAL_ACCOUNT_ID, true]);
+        });
+    });
+
     it('does not overwrite an existing createdAt timestamp', async () => {
         const originalCreatedAt = Date.now() - 24 * 60 * 60 * 1000;
         await Onyx.multiSet({
diff --git a/tests/unit/pages/settings/AddAgentPageTest.tsx b/tests/unit/pages/settings/AddAgentPageTest.tsx
index 0fee96383ff8..9c6049429907 100644
--- a/tests/unit/pages/settings/AddAgentPageTest.tsx
+++ b/tests/unit/pages/settings/AddAgentPageTest.tsx
@@ -318,7 +318,7 @@ describe('AddAgentPage', () => {
 
             mockFormOnSubmit?.({firstName: 'Bot', prompt: 'Reject gambling.'});
 
-            expect(mockCreateAgent).toHaveBeenCalledWith('Bot', 'Reject gambling.', OWNER_ACCOUNT_ID, OWNER_LOGIN, 'bot-avatar--blue', undefined, undefined, undefined, undefined);
+            expect(mockCreateAgent).toHaveBeenCalledWith('Bot', 'Reject gambling.', OWNER_ACCOUNT_ID, OWNER_LOGIN, 'bot-avatar--blue', undefined, undefined, undefined);
             expect(mockClearNewAgentTemplate).toHaveBeenCalledTimes(1);
             expect(mockClearNewAgentAvatarDraft).toHaveBeenCalledTimes(1);
             expect(mockRevealRouteBeforeDismissingModal).toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(OPTIMISTIC_REPORT_ID));
@@ -329,7 +329,7 @@ describe('AddAgentPage', () => {
 
             mockFormOnSubmit?.({firstName: 'Bot', prompt: 'Reject gambling.'});
 
-            expect(mockCreateAgent).toHaveBeenCalledWith('Bot', 'Reject gambling.', OWNER_ACCOUNT_ID, OWNER_LOGIN, 'bot-avatar--blue', undefined, undefined, 'POL_42', undefined);
+            expect(mockCreateAgent).toHaveBeenCalledWith('Bot', 'Reject gambling.', OWNER_ACCOUNT_ID, OWNER_LOGIN, 'bot-avatar--blue', undefined, undefined, 'POL_42');
             expect(mockRevealRouteBeforeDismissingModal).toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(OPTIMISTIC_REPORT_ID));
         });
 
@@ -348,7 +348,7 @@ describe('AddAgentPage', () => {
 
             mockFormOnSubmit?.({firstName: 'Bot', prompt: 'Reject gambling.'});
 
-            expect(mockCreateAgent).toHaveBeenCalledWith('Bot', 'Reject gambling.', OWNER_ACCOUNT_ID, OWNER_LOGIN, 'bot-avatar--blue', undefined, undefined, undefined, undefined);
+            expect(mockCreateAgent).toHaveBeenCalledWith('Bot', 'Reject gambling.', OWNER_ACCOUNT_ID, OWNER_LOGIN, 'bot-avatar--blue', undefined, undefined, undefined);
         });
 
         it('creates the agent with the reconstructed uploaded file when a photo was uploaded', () => {