From 511a7460b0df115b20aca458011067f7ecf7448d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20=C5=A0=C4=87eki=C4=87?=
 <4062236+iscekic@users.noreply.github.com>
Date: Wed, 21 Oct 2026 21:20:25 +0000
Subject: [PATCH 1/7] fix(mobile): open Code Reviewer and Security Agent above
 the tabs

The Home Explore shortcuts for Code Reviewer and Security Agent pushed
routes that live inside the Profile tab's stack, so expo-router switched
the tab navigator and the bottom bar drew Profile as the selected tab
while those screens were on top.

Move both route trees out of `(tabs)/(3_profile)` into the root stack,
like PR Review: the screens open above the tab bar, no tab is marked
selected while they are up, and going back returns to the tab the user
came from. URL paths are unchanged because group segments are not part
of a URL, and the shared universal-link table now targets the new
paths. A last-route record mirrored by an older build is read at the
screen's current path instead of an unmatched one.

The content clearance follows the same rule: the root stack publishes
that no tab bar sits under its screens, so their scroll views reserve
the safe-area inset instead of a bar height.
---
 apps/mobile/src/app/(app)/_layout.tsx         | 181 +++++++++---------
 .../[scope]/[platform]/(edit)/_layout.tsx     |   0
 .../(edit)/focus-areas.mounted.test.tsx       |   0
 .../[scope]/[platform]/(edit)/focus-areas.tsx |   0
 .../[scope]/[platform]/(edit)/gate.tsx        |   0
 .../[platform]/(edit)/instructions.tsx        |   0
 .../[scope]/[platform]/(edit)/repos.tsx       |   0
 .../[scope]/[platform]/(edit)/style.tsx       |   0
 .../[scope]/[platform]/_layout.tsx            |   2 +-
 .../[scope]/[platform]/index.tsx              |   0
 .../[scope]/index.mounted.test.tsx            |   0
 .../code-reviewer/[scope]/index.tsx           |   0
 .../[scope]/manual-review.mounted.test.tsx    |   0
 .../code-reviewer/[scope]/manual-review.tsx   |   0
 .../code-reviewer/[scope]/review-memory.tsx   |   0
 .../[scope]/reviews/[id].mounted.test.tsx     |   8 +-
 .../code-reviewer/[scope]/reviews/[id].tsx    |   4 +-
 .../[scope]/reviews/index.mounted.test.tsx    |   0
 .../code-reviewer/[scope]/reviews/index.tsx   |   0
 .../(3_profile) => }/code-reviewer/index.tsx  |   0
 .../security-agent/[scope]/_layout.tsx        |   2 +-
 .../security-agent/[scope]/audit-report.tsx   |   0
 .../security-agent/[scope]/dismiss/[id].tsx   |   4 +-
 .../security-agent/[scope]/filter.tsx         |   0
 .../security-agent/[scope]/findings/[id].tsx  |   4 +-
 .../security-agent/[scope]/findings/index.tsx |   0
 .../security-agent/[scope]/index.tsx          |   0
 .../[scope]/settings/analysis.tsx             |   0
 .../[scope]/settings/automation.tsx           |   0
 .../security-agent/[scope]/settings/index.tsx |   0
 .../[scope]/settings/notifications.tsx        |   0
 .../[scope]/settings/repositories.tsx         |   0
 .../security-agent/[scope]/settings/sla.tsx   |   0
 .../(3_profile) => }/security-agent/index.tsx |   0
 .../app-unlock-screen.mounted.test.tsx        |   2 +-
 .../code-reviewer/bitbucket-overview.tsx      |   2 +-
 .../full-surface-states.mounted.test.tsx      |   4 +-
 .../manual-review-action-footer.tsx           |  14 +-
 .../manual-review-screen.mounted.test.tsx     |  66 +++----
 .../code-reviewer/manual-review-screen.tsx    |   6 +-
 .../code-reviewer/platform-list-screen.tsx    |  10 +-
 .../platform-overview-screen.tsx              |   6 +-
 .../review-detail-screen.mounted.test.tsx     |   4 +-
 .../code-reviewer/review-detail-screen.tsx    |   4 +-
 .../code-reviewer/review-list-screen.tsx      |   8 +-
 .../code-reviewer/scope-list-screen.tsx       |   2 +-
 ...ail-screen.analysis-crash.mounted.test.tsx |   2 +-
 .../finding-detail-screen.mounted.test.tsx    |   2 +-
 .../finding-list-screen.mounted.test.tsx      |   2 +-
 .../components/tab-screen.mounted.test.tsx    |  50 ++++-
 apps/mobile/src/components/tab-screen.tsx     |  10 +-
 apps/mobile/src/lib/deep-link-handler.test.ts |   6 +-
 apps/mobile/src/lib/deep-link-launch.test.ts  |   4 +-
 .../src/lib/hooks/use-reviewer-permission.ts  |   2 +-
 apps/mobile/src/lib/last-route.test.ts        |  19 ++
 apps/mobile/src/lib/last-route.ts             |  23 ++-
 .../src/lib/notification-actions.test.ts      |   2 +-
 .../src/lib/notification-path-schema.test.ts  |   4 +-
 apps/mobile/src/lib/notification-path.test.ts |   8 +-
 apps/mobile/src/lib/notifications.test.ts     |   2 +-
 .../mobile/src/lib/pending-navigation.test.ts |   6 +-
 .../src/lib/profile-agent-navigation.test.ts  |  14 +-
 .../src/lib/profile-agent-navigation.ts       |   2 +-
 apps/mobile/src/lib/security-agent.test.ts    |   4 +-
 apps/mobile/src/lib/security-agent.ts         |   2 +-
 ...y-notification-navigation.mounted.test.tsx |   8 +-
 .../src/lib/system-search-collect.test.ts     |   6 +-
 .../src/lib/system-search-entries.test.ts     |  32 ++--
 apps/mobile/src/lib/system-search-entries.ts  |   8 +-
 apps/mobile/src/lib/system-search-families.ts |  12 +-
 .../src/lib/system-search-route.test.ts       |   2 +-
 apps/mobile/src/lib/tab-bar-clearance.ts      |  31 +--
 apps/mobile/src/lib/tab-press.test.ts         |  12 +-
 .../src/universal-links/routes.test.ts        |  38 ++--
 .../app-shared/src/universal-links/routes.ts  |  16 +-
 75 files changed, 342 insertions(+), 320 deletions(-)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/code-reviewer/[scope]/[platform]/(edit)/_layout.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/code-reviewer/[scope]/[platform]/(edit)/focus-areas.mounted.test.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/code-reviewer/[scope]/[platform]/(edit)/focus-areas.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/code-reviewer/[scope]/[platform]/(edit)/gate.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/code-reviewer/[scope]/[platform]/(edit)/instructions.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/code-reviewer/[scope]/[platform]/(edit)/repos.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/code-reviewer/[scope]/[platform]/(edit)/style.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/code-reviewer/[scope]/[platform]/_layout.tsx (87%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/code-reviewer/[scope]/[platform]/index.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/code-reviewer/[scope]/index.mounted.test.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/code-reviewer/[scope]/index.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/code-reviewer/[scope]/manual-review.mounted.test.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/code-reviewer/[scope]/manual-review.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/code-reviewer/[scope]/review-memory.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/code-reviewer/[scope]/reviews/[id].mounted.test.tsx (94%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/code-reviewer/[scope]/reviews/[id].tsx (85%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/code-reviewer/[scope]/reviews/index.mounted.test.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/code-reviewer/[scope]/reviews/index.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/code-reviewer/index.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/security-agent/[scope]/_layout.tsx (95%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/security-agent/[scope]/audit-report.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/security-agent/[scope]/dismiss/[id].tsx (82%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/security-agent/[scope]/filter.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/security-agent/[scope]/findings/[id].tsx (82%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/security-agent/[scope]/findings/index.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/security-agent/[scope]/index.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/security-agent/[scope]/settings/analysis.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/security-agent/[scope]/settings/automation.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/security-agent/[scope]/settings/index.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/security-agent/[scope]/settings/notifications.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/security-agent/[scope]/settings/repositories.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/security-agent/[scope]/settings/sla.tsx (100%)
 rename apps/mobile/src/app/(app)/{(tabs)/(3_profile) => }/security-agent/index.tsx (100%)

diff --git a/apps/mobile/src/app/(app)/_layout.tsx b/apps/mobile/src/app/(app)/_layout.tsx
index 84a5f5ffc6b..eddfdf19f24 100644
--- a/apps/mobile/src/app/(app)/_layout.tsx
+++ b/apps/mobile/src/app/(app)/_layout.tsx
@@ -30,6 +30,7 @@ import { useSecurityLifecycleInvalidation } from '@/lib/hooks/use-security-lifec
 import { CachePersistenceMount } from '@/lib/persist/cache-persistence-mount';
 import { SystemSearchIndexMount } from '@/lib/system-search-index-mount';
 import { ToolSummaryTranslationRetryMount } from '@/lib/tool-summary-translation/tool-summary-translation-retry-mount';
+import { TabBarLabelContext } from '@/lib/tab-bar-clearance';
 import { useTRPC } from '@/lib/trpc';
 
 /**
@@ -134,96 +135,100 @@ export default function AppLayout() {
       <TourAutoOpen />
       <KiloChatProvider>
         <KiloChatPresenceMount>
-          <Stack
-            screenLayout={appUnlockScreenLayout}
-            screenOptions={{
-              contentStyle: { backgroundColor: colors.background },
-              headerShown: false,
-              headerStyle: { backgroundColor: colors.background },
-              headerTintColor: colors.foreground,
-            }}
-          >
-            <Stack.Screen name="(tabs)" />
-            <Stack.Screen name="pr-review/index" options={{ headerShown: false }} />
-            <Stack.Screen
-              name="pr-review/[owner]/[repo]/[number]"
-              options={{ headerShown: false }}
-            />
-            <Stack.Screen name="agent-chat/new" options={{ headerShown: false }} />
-            <Stack.Screen name="agent-chat/[session-id]" />
-            <Stack.Screen name="session-changes/[session-id]" options={{ headerShown: false }} />
-            <Stack.Screen name="agent-chat/model-picker" options={searchSheetOptions} />
-            <Stack.Screen name="agent-chat/repo-picker" options={searchSheetOptions} />
-            <Stack.Screen name="agent-chat/branch-picker" options={sheetOptions} />
-            <Stack.Screen
-              name="agent-chat/mode-picker"
-              options={{ ...sheetOptions, sheetAllowedDetents: [0.5] }}
-            />
-            <Stack.Screen name="agent-chat/instance-picker" options={sheetOptions} />
-            <Stack.Screen name="agent-chat/folder-picker" options={sheetOptions} />
-            <Stack.Screen name="agent-chat/profile-picker" options={sheetOptions} />
-            <Stack.Screen name="todos/[list-id]" />
-            <Stack.Screen name="todos/item/[item-id]" />
-            <Stack.Screen
-              name="todos/list-settings"
-              options={{ ...sheetOptions, gestureEnabled: false }}
-            />
-            <Stack.Screen name="agent-briefing/index" />
-            <Stack.Screen name="agent-briefing/[report-id]" />
-            <Stack.Screen name="agent-briefing/settings" />
-            <Stack.Screen name="share-gate" options={sheetOptions} />
-            <Stack.Screen name="language-picker" options={searchSheetOptions} />
-            <Stack.Screen name="transcription-model-picker" options={sheetOptions} />
-            <Stack.Screen name="voice-language-picker" options={searchSheetOptions} />
-            <Stack.Screen
-              name="kilo-pass"
-              options={{
-                presentation: 'modal',
+          {/* The root stack draws no tab bar: the tabs live inside `(tabs)`,
+              whose layout publishes its own decision for every tab screen. */}
+          <TabBarLabelContext value={null}>
+            <Stack
+              screenLayout={appUnlockScreenLayout}
+              screenOptions={{
+                contentStyle: { backgroundColor: colors.background },
                 headerShown: false,
+                headerStyle: { backgroundColor: colors.background },
+                headerTintColor: colors.foreground,
               }}
-            />
-            <Stack.Screen
-              name="credits"
-              options={{
-                presentation: 'modal',
-                headerShown: false,
-              }}
-            />
-            <Stack.Screen
-              name="onboarding"
-              options={{
-                presentation: 'modal',
-                headerShown: false,
-                gestureEnabled: false,
-              }}
-            />
-            <Stack.Screen
-              name="tour"
-              options={{
-                presentation: 'modal',
-                headerShown: false,
-                // A swipe-down dismissal would bypass the tour's own dismissal
-                // (which records the per-account decision). Match `onboarding`
-                // and `consent`: the only exits are the tour's own controls and
-                // Android hardware Back, both of which record first.
-                gestureEnabled: false,
-              }}
-            />
-            <Stack.Screen
-              name="consent"
-              options={{
-                presentation: 'modal',
-                headerShown: false,
-                gestureEnabled: false,
-              }}
-            />
-            <Stack.Screen
-              name="consent-details"
-              options={{
-                headerShown: false,
-              }}
-            />
-          </Stack>
+            >
+              <Stack.Screen name="(tabs)" />
+              <Stack.Screen name="pr-review/index" options={{ headerShown: false }} />
+              <Stack.Screen
+                name="pr-review/[owner]/[repo]/[number]"
+                options={{ headerShown: false }}
+              />
+              <Stack.Screen name="agent-chat/new" options={{ headerShown: false }} />
+              <Stack.Screen name="agent-chat/[session-id]" />
+              <Stack.Screen name="session-changes/[session-id]" options={{ headerShown: false }} />
+              <Stack.Screen name="agent-chat/model-picker" options={searchSheetOptions} />
+              <Stack.Screen name="agent-chat/repo-picker" options={searchSheetOptions} />
+              <Stack.Screen name="agent-chat/branch-picker" options={sheetOptions} />
+              <Stack.Screen
+                name="agent-chat/mode-picker"
+                options={{ ...sheetOptions, sheetAllowedDetents: [0.5] }}
+              />
+              <Stack.Screen name="agent-chat/instance-picker" options={sheetOptions} />
+              <Stack.Screen name="agent-chat/folder-picker" options={sheetOptions} />
+              <Stack.Screen name="agent-chat/profile-picker" options={sheetOptions} />
+              <Stack.Screen name="todos/[list-id]" />
+              <Stack.Screen name="todos/item/[item-id]" />
+              <Stack.Screen
+                name="todos/list-settings"
+                options={{ ...sheetOptions, gestureEnabled: false }}
+              />
+              <Stack.Screen name="agent-briefing/index" />
+              <Stack.Screen name="agent-briefing/[report-id]" />
+              <Stack.Screen name="agent-briefing/settings" />
+              <Stack.Screen name="share-gate" options={sheetOptions} />
+              <Stack.Screen name="language-picker" options={searchSheetOptions} />
+              <Stack.Screen name="transcription-model-picker" options={sheetOptions} />
+              <Stack.Screen name="voice-language-picker" options={searchSheetOptions} />
+              <Stack.Screen
+                name="kilo-pass"
+                options={{
+                  presentation: 'modal',
+                  headerShown: false,
+                }}
+              />
+              <Stack.Screen
+                name="credits"
+                options={{
+                  presentation: 'modal',
+                  headerShown: false,
+                }}
+              />
+              <Stack.Screen
+                name="onboarding"
+                options={{
+                  presentation: 'modal',
+                  headerShown: false,
+                  gestureEnabled: false,
+                }}
+              />
+              <Stack.Screen
+                name="tour"
+                options={{
+                  presentation: 'modal',
+                  headerShown: false,
+                  // A swipe-down dismissal would bypass the tour's own dismissal
+                  // (which records the per-account decision). Match `onboarding`
+                  // and `consent`: the only exits are the tour's own controls and
+                  // Android hardware Back, both of which record first.
+                  gestureEnabled: false,
+                }}
+              />
+              <Stack.Screen
+                name="consent"
+                options={{
+                  presentation: 'modal',
+                  headerShown: false,
+                  gestureEnabled: false,
+                }}
+              />
+              <Stack.Screen
+                name="consent-details"
+                options={{
+                  headerShown: false,
+                }}
+              />
+            </Stack>
+          </TabBarLabelContext>
         </KiloChatPresenceMount>
       </KiloChatProvider>
     </UserWebConnectionProvider>
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/[platform]/(edit)/_layout.tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/[platform]/(edit)/_layout.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/[platform]/(edit)/_layout.tsx
rename to apps/mobile/src/app/(app)/code-reviewer/[scope]/[platform]/(edit)/_layout.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/[platform]/(edit)/focus-areas.mounted.test.tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/[platform]/(edit)/focus-areas.mounted.test.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/[platform]/(edit)/focus-areas.mounted.test.tsx
rename to apps/mobile/src/app/(app)/code-reviewer/[scope]/[platform]/(edit)/focus-areas.mounted.test.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/[platform]/(edit)/focus-areas.tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/[platform]/(edit)/focus-areas.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/[platform]/(edit)/focus-areas.tsx
rename to apps/mobile/src/app/(app)/code-reviewer/[scope]/[platform]/(edit)/focus-areas.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/[platform]/(edit)/gate.tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/[platform]/(edit)/gate.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/[platform]/(edit)/gate.tsx
rename to apps/mobile/src/app/(app)/code-reviewer/[scope]/[platform]/(edit)/gate.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/[platform]/(edit)/instructions.tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/[platform]/(edit)/instructions.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/[platform]/(edit)/instructions.tsx
rename to apps/mobile/src/app/(app)/code-reviewer/[scope]/[platform]/(edit)/instructions.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/[platform]/(edit)/repos.tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/[platform]/(edit)/repos.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/[platform]/(edit)/repos.tsx
rename to apps/mobile/src/app/(app)/code-reviewer/[scope]/[platform]/(edit)/repos.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/[platform]/(edit)/style.tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/[platform]/(edit)/style.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/[platform]/(edit)/style.tsx
rename to apps/mobile/src/app/(app)/code-reviewer/[scope]/[platform]/(edit)/style.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/[platform]/_layout.tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/[platform]/_layout.tsx
similarity index 87%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/[platform]/_layout.tsx
rename to apps/mobile/src/app/(app)/code-reviewer/[scope]/[platform]/_layout.tsx
index 88b793d5cb0..b24e8929bad 100644
--- a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/[platform]/_layout.tsx
+++ b/apps/mobile/src/app/(app)/code-reviewer/[scope]/[platform]/_layout.tsx
@@ -11,7 +11,7 @@ export default function CodeReviewerPlatformLayout() {
   const params = useValidatedReviewerRouteParams();
 
   if (!params) {
-    return <InvalidRouteState backTo={'/(app)/(tabs)/(3_profile)/code-reviewer' as Href} />;
+    return <InvalidRouteState backTo={'/(app)/code-reviewer' as Href} />;
   }
 
   return <Stack screenOptions={{ headerShown: false }} />;
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/[platform]/index.tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/[platform]/index.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/[platform]/index.tsx
rename to apps/mobile/src/app/(app)/code-reviewer/[scope]/[platform]/index.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/index.mounted.test.tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/index.mounted.test.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/index.mounted.test.tsx
rename to apps/mobile/src/app/(app)/code-reviewer/[scope]/index.mounted.test.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/index.tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/index.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/index.tsx
rename to apps/mobile/src/app/(app)/code-reviewer/[scope]/index.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/manual-review.mounted.test.tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/manual-review.mounted.test.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/manual-review.mounted.test.tsx
rename to apps/mobile/src/app/(app)/code-reviewer/[scope]/manual-review.mounted.test.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/manual-review.tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/manual-review.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/manual-review.tsx
rename to apps/mobile/src/app/(app)/code-reviewer/[scope]/manual-review.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/review-memory.tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/review-memory.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/review-memory.tsx
rename to apps/mobile/src/app/(app)/code-reviewer/[scope]/review-memory.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/reviews/[id].mounted.test.tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/[id].mounted.test.tsx
similarity index 94%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/reviews/[id].mounted.test.tsx
rename to apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/[id].mounted.test.tsx
index 96b5e994d95..eac9ee559a4 100644
--- a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/reviews/[id].mounted.test.tsx
+++ b/apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/[id].mounted.test.tsx
@@ -86,9 +86,7 @@ describe('CodeReviewerReviewDetailRoute invalid id', () => {
 
     const invalid = findByType(renderer.root, 'InvalidRouteState');
     expect(invalid).toHaveLength(1);
-    expect(propOf(invalid[0], 'backTo')).toBe(
-      '/(app)/(tabs)/(3_profile)/code-reviewer/personal/reviews'
-    );
+    expect(propOf(invalid[0], 'backTo')).toBe('/(app)/code-reviewer/personal/reviews');
     expect(findByType(renderer.root, 'ReviewDetailScreen')).toHaveLength(0);
 
     act(() => {
@@ -102,9 +100,7 @@ describe('CodeReviewerReviewDetailRoute invalid id', () => {
 
     const invalid = findByType(renderer.root, 'InvalidRouteState');
     expect(invalid).toHaveLength(1);
-    expect(propOf(invalid[0], 'backTo')).toBe(
-      '/(app)/(tabs)/(3_profile)/code-reviewer/personal/reviews'
-    );
+    expect(propOf(invalid[0], 'backTo')).toBe('/(app)/code-reviewer/personal/reviews');
     expect(findByType(renderer.root, 'ReviewDetailScreen')).toHaveLength(0);
 
     act(() => {
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/reviews/[id].tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/[id].tsx
similarity index 85%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/reviews/[id].tsx
rename to apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/[id].tsx
index 104d78a912c..022684c9f6f 100644
--- a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/reviews/[id].tsx
+++ b/apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/[id].tsx
@@ -11,9 +11,7 @@ export default function CodeReviewerReviewDetailRoute() {
 
   if (!scope || !reviewId) {
     const backTo = (
-      scope
-        ? `/(app)/(tabs)/(3_profile)/code-reviewer/${scope}/reviews`
-        : '/(app)/(tabs)/(3_profile)'
+      scope ? `/(app)/code-reviewer/${scope}/reviews` : '/(app)/(tabs)/(3_profile)'
     ) as Href;
     return <InvalidRouteState backTo={backTo} />;
   }
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/reviews/index.mounted.test.tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/index.mounted.test.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/reviews/index.mounted.test.tsx
rename to apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/index.mounted.test.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/reviews/index.tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/index.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/reviews/index.tsx
rename to apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/index.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/index.tsx b/apps/mobile/src/app/(app)/code-reviewer/index.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/code-reviewer/index.tsx
rename to apps/mobile/src/app/(app)/code-reviewer/index.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/_layout.tsx b/apps/mobile/src/app/(app)/security-agent/[scope]/_layout.tsx
similarity index 95%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/_layout.tsx
rename to apps/mobile/src/app/(app)/security-agent/[scope]/_layout.tsx
index 077ade23fb4..f97693f8c57 100644
--- a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/_layout.tsx
+++ b/apps/mobile/src/app/(app)/security-agent/[scope]/_layout.tsx
@@ -18,7 +18,7 @@ export default function SecurityAgentScopeLayout() {
   const sheetOptions = useFormSheetScreenOptions();
 
   if (!scope) {
-    return <InvalidRouteState backTo={'/(app)/(tabs)/(3_profile)/security-agent' as Href} />;
+    return <InvalidRouteState backTo={'/(app)/security-agent' as Href} />;
   }
 
   return (
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/audit-report.tsx b/apps/mobile/src/app/(app)/security-agent/[scope]/audit-report.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/audit-report.tsx
rename to apps/mobile/src/app/(app)/security-agent/[scope]/audit-report.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/dismiss/[id].tsx b/apps/mobile/src/app/(app)/security-agent/[scope]/dismiss/[id].tsx
similarity index 82%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/dismiss/[id].tsx
rename to apps/mobile/src/app/(app)/security-agent/[scope]/dismiss/[id].tsx
index 2a0c2436302..a475700d253 100644
--- a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/dismiss/[id].tsx
+++ b/apps/mobile/src/app/(app)/security-agent/[scope]/dismiss/[id].tsx
@@ -9,9 +9,7 @@ export default function SecurityAgentDismissFindingRoute() {
   const findingId = parseParam(rawId);
 
   if (!findingId) {
-    return (
-      <InvalidRouteState backTo={`/(app)/(tabs)/(3_profile)/security-agent/${scope}` as Href} />
-    );
+    return <InvalidRouteState backTo={`/(app)/security-agent/${scope}` as Href} />;
   }
 
   return <DismissFindingScreen scope={scope} findingId={findingId} />;
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/filter.tsx b/apps/mobile/src/app/(app)/security-agent/[scope]/filter.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/filter.tsx
rename to apps/mobile/src/app/(app)/security-agent/[scope]/filter.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/findings/[id].tsx b/apps/mobile/src/app/(app)/security-agent/[scope]/findings/[id].tsx
similarity index 82%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/findings/[id].tsx
rename to apps/mobile/src/app/(app)/security-agent/[scope]/findings/[id].tsx
index f47d2e08e29..57f70f97460 100644
--- a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/findings/[id].tsx
+++ b/apps/mobile/src/app/(app)/security-agent/[scope]/findings/[id].tsx
@@ -9,9 +9,7 @@ export default function SecurityAgentFindingDetailRoute() {
   const findingId = parseParam(rawId);
 
   if (!findingId) {
-    return (
-      <InvalidRouteState backTo={`/(app)/(tabs)/(3_profile)/security-agent/${scope}` as Href} />
-    );
+    return <InvalidRouteState backTo={`/(app)/security-agent/${scope}` as Href} />;
   }
 
   return <FindingDetailScreen scope={scope} findingId={findingId} />;
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/findings/index.tsx b/apps/mobile/src/app/(app)/security-agent/[scope]/findings/index.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/findings/index.tsx
rename to apps/mobile/src/app/(app)/security-agent/[scope]/findings/index.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/index.tsx b/apps/mobile/src/app/(app)/security-agent/[scope]/index.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/index.tsx
rename to apps/mobile/src/app/(app)/security-agent/[scope]/index.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/settings/analysis.tsx b/apps/mobile/src/app/(app)/security-agent/[scope]/settings/analysis.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/settings/analysis.tsx
rename to apps/mobile/src/app/(app)/security-agent/[scope]/settings/analysis.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/settings/automation.tsx b/apps/mobile/src/app/(app)/security-agent/[scope]/settings/automation.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/settings/automation.tsx
rename to apps/mobile/src/app/(app)/security-agent/[scope]/settings/automation.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/settings/index.tsx b/apps/mobile/src/app/(app)/security-agent/[scope]/settings/index.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/settings/index.tsx
rename to apps/mobile/src/app/(app)/security-agent/[scope]/settings/index.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/settings/notifications.tsx b/apps/mobile/src/app/(app)/security-agent/[scope]/settings/notifications.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/settings/notifications.tsx
rename to apps/mobile/src/app/(app)/security-agent/[scope]/settings/notifications.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/settings/repositories.tsx b/apps/mobile/src/app/(app)/security-agent/[scope]/settings/repositories.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/settings/repositories.tsx
rename to apps/mobile/src/app/(app)/security-agent/[scope]/settings/repositories.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/settings/sla.tsx b/apps/mobile/src/app/(app)/security-agent/[scope]/settings/sla.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/settings/sla.tsx
rename to apps/mobile/src/app/(app)/security-agent/[scope]/settings/sla.tsx
diff --git a/apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/index.tsx b/apps/mobile/src/app/(app)/security-agent/index.tsx
similarity index 100%
rename from apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/index.tsx
rename to apps/mobile/src/app/(app)/security-agent/index.tsx
diff --git a/apps/mobile/src/components/app-unlock-screen.mounted.test.tsx b/apps/mobile/src/components/app-unlock-screen.mounted.test.tsx
index c9c1c2c0ccc..a383cbdf2a8 100644
--- a/apps/mobile/src/components/app-unlock-screen.mounted.test.tsx
+++ b/apps/mobile/src/components/app-unlock-screen.mounted.test.tsx
@@ -26,7 +26,7 @@ import fr from '@/i18n/locales/fr.json';
 import AppLayout from '@/app/(app)/_layout';
 import KiloClawLayout from '@/app/(app)/(tabs)/(1_kiloclaw)/_layout';
 import OrganizationLayout from '@/app/(app)/(tabs)/(3_profile)/organization/_layout';
-import SecurityAgentScopeLayout from '@/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/_layout';
+import SecurityAgentScopeLayout from '@/app/(app)/security-agent/[scope]/_layout';
 import PrReviewNumberLayout from '@/app/(app)/pr-review/[owner]/[repo]/[number]/_layout';
 import { AppUnlockProvider } from '@/lib/app-unlock-context';
 
diff --git a/apps/mobile/src/components/code-reviewer/bitbucket-overview.tsx b/apps/mobile/src/components/code-reviewer/bitbucket-overview.tsx
index 2f1e0323bda..96ec14147ed 100644
--- a/apps/mobile/src/components/code-reviewer/bitbucket-overview.tsx
+++ b/apps/mobile/src/components/code-reviewer/bitbucket-overview.tsx
@@ -124,7 +124,7 @@ export function BitbucketOverview({
   }
 
   const pushField = (field: string) => {
-    router.push(`/(app)/(tabs)/(3_profile)/code-reviewer/${scope}/bitbucket/${field}` as Href);
+    router.push(`/(app)/code-reviewer/${scope}/bitbucket/${field}` as Href);
   };
 
   const data = config.data;
diff --git a/apps/mobile/src/components/code-reviewer/full-surface-states.mounted.test.tsx b/apps/mobile/src/components/code-reviewer/full-surface-states.mounted.test.tsx
index b2e3225661b..b2f74193c58 100644
--- a/apps/mobile/src/components/code-reviewer/full-surface-states.mounted.test.tsx
+++ b/apps/mobile/src/components/code-reviewer/full-surface-states.mounted.test.tsx
@@ -3,7 +3,7 @@ import { createElement, type ReactElement, type ReactNode } from 'react';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import '@/i18n';
-import ReposRoute from '@/app/(app)/(tabs)/(3_profile)/code-reviewer/[scope]/[platform]/(edit)/repos';
+import ReposRoute from '@/app/(app)/code-reviewer/[scope]/[platform]/(edit)/repos';
 import { ReviewListScreen } from './review-list-screen';
 import { renderWithProviders, type RenderWithProvidersResult } from '@/test/render-with-providers';
 
@@ -258,7 +258,7 @@ describe('Recent review bodies', () => {
       const action = empty.props.action as ReactElement<{ onPress: () => void }>;
       action.props.onPress();
       expect(state.push).toHaveBeenCalledWith(
-        `/(app)/(tabs)/(3_profile)/code-reviewer/personal${connected ? '/manual-review' : ''}`
+        `/(app)/code-reviewer/personal${connected ? '/manual-review' : ''}`
       );
       unmount();
     }
diff --git a/apps/mobile/src/components/code-reviewer/manual-review-action-footer.tsx b/apps/mobile/src/components/code-reviewer/manual-review-action-footer.tsx
index 7ba83f3d61f..ca35e33f5c5 100644
--- a/apps/mobile/src/components/code-reviewer/manual-review-action-footer.tsx
+++ b/apps/mobile/src/components/code-reviewer/manual-review-action-footer.tsx
@@ -10,20 +10,20 @@ import { useTabBarBottomPadding } from '@/components/tab-screen';
  * The action used to be the scroll body's last child. At large display
  * densities the form is taller than the viewport, so it was clipped mid-label
  * at the scroll fold, against the tab bar (explorer manual-review finding,
- * 2026-09-19). The footer keeps its own layout space clear of the tab bar, so
- * the call to action is always fully legible.
+ * 2026-09-19). The footer reserves the screen's bottom clearance, so the call
+ * to action is always fully legible.
  *
  * The host wraps this footer and the scroll body in the keyboard-lift view,
  * which owns the bottom space while the keyboard is open. The footer's own
  * clearance therefore covers only what the lift does not: a keyboard taller
- * than the tab bar drops it to 0, while a keyboard shorter than the tab bar
- * (the hardware-keyboard IME bar is one navigation bar tall) keeps the rest, so
- * the action never lands behind the tab bar (e1-fill, 2026-09-19).
+ * than the clearance drops it to 0, while a shorter one (the hardware-keyboard
+ * IME bar is one navigation bar tall) keeps the rest, so the action never lands
+ * behind the bottom edge (e1-fill, 2026-09-19).
  */
 export function ManualReviewActionFooter({ children }: Readonly<{ children: ReactNode }>) {
-  const tabBarBottomPadding = useTabBarBottomPadding();
+  const bottomClearance = useTabBarBottomPadding();
   const keyboardLift = useKeyboardState(state => state.height);
-  const bottomPadding = Math.max(0, tabBarBottomPadding - keyboardLift);
+  const bottomPadding = Math.max(0, bottomClearance - keyboardLift);
   return (
     <View className="bg-background px-6 pt-3" style={{ paddingBottom: bottomPadding }}>
       {children}
diff --git a/apps/mobile/src/components/code-reviewer/manual-review-screen.mounted.test.tsx b/apps/mobile/src/components/code-reviewer/manual-review-screen.mounted.test.tsx
index 6f33722d457..afa3e25d557 100644
--- a/apps/mobile/src/components/code-reviewer/manual-review-screen.mounted.test.tsx
+++ b/apps/mobile/src/components/code-reviewer/manual-review-screen.mounted.test.tsx
@@ -4,7 +4,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
 import '@/i18n';
 import { act, type TestRenderer } from '@/test/renderer';
 import { renderWithProviders } from '@/test/render-with-providers';
-import { getEffectiveTabBarHeight } from '@/lib/tab-bar-layout';
+import { TabBarLabelContext } from '@/lib/tab-bar-clearance';
 
 import { ManualReviewScreen } from './manual-review-screen';
 
@@ -12,7 +12,7 @@ import { ManualReviewScreen } from './manual-review-screen';
 // clipped mid-label at the scroll fold, under the tab bar, at 560 density. The
 // fix pins the action in a footer below the scroll view, so these tests assert
 // the structural guarantee (the action is not inside the scroll viewport) and
-// the footer clearance (it sits a tab bar's height above the overlay).
+// the footer clearance (it sits the screen's bottom clearance above the edge).
 const BOTTOM_INSET = 24;
 const TAB_SCREEN_BOTTOM_GAP = 16;
 
@@ -172,8 +172,13 @@ function only<T>(items: T[], what: string): T {
 }
 
 async function renderScreen() {
+  // The root stack publishes `null`: no tab bar under this screen.
   const { renderer, unmount } = await renderWithProviders(
-    createElement(ManualReviewScreen, { scope: 'personal' })
+    createElement(
+      TabBarLabelContext,
+      { value: null },
+      createElement(ManualReviewScreen, { scope: 'personal' })
+    )
   );
   return { renderer, unmount };
 }
@@ -215,7 +220,7 @@ describe.each(['android', 'ios'] as const)('ManualReviewScreen primary action on
     platformState.OS = platform;
   });
 
-  it('pins the start action outside the scroll viewport, clear of the tab bar', async () => {
+  it('pins the start action outside the scroll viewport, clear of the bottom inset', async () => {
     const { renderer, unmount } = await renderScreen();
 
     const scrollViews = findAllOfType(renderer.root, 'ScrollView');
@@ -227,21 +232,15 @@ describe.each(['android', 'ios'] as const)('ManualReviewScreen primary action on
 
     const action = only(findAllOfType(renderer.root, 'Button'), 'primary action');
     const [footerClearance] = paddingBottomsAbove(action);
-    expect(footerClearance).toBe(
-      getEffectiveTabBarHeight({
-        bottomInset: BOTTOM_INSET,
-        platform,
-        fontScale: 1,
-      }) + TAB_SCREEN_BOTTOM_GAP
-    );
+    expect(footerClearance).toBe(BOTTOM_INSET + TAB_SCREEN_BOTTOM_GAP);
 
     unmount();
   });
 
-  it('drops the tab bar clearance while the keyboard lifts the footer', async () => {
+  it('drops the bottom clearance while the keyboard lifts the footer', async () => {
     const { renderer, unmount } = await renderScreen();
 
-    // A keyboard at least as tall as the tab bar. The footer hands the whole
+    // A keyboard at least as tall as the clearance. The footer hands the whole
     // bottom space to the lift view (`KeyboardAvoidingView`), which owns it
     // while the keyboard is open, so its own clearance collapses to 0.
     const keyboardLift = platform === 'android' ? 300 : 324;
@@ -255,36 +254,29 @@ describe.each(['android', 'ios'] as const)('ManualReviewScreen primary action on
     expect(findAllOfType(renderer.root, 'KeyboardAvoidingView')).toHaveLength(1);
 
     // The provider clears the height when the keyboard hides; the footer
-    // restores its tab-bar clearance.
+    // restores its bottom clearance.
     act(() => {
       keyboardStore.setHeight(0);
     });
-    expect(paddingBottomsAbove(action)).toEqual([
-      getEffectiveTabBarHeight({ bottomInset: BOTTOM_INSET, platform, fontScale: 1 }) +
-        TAB_SCREEN_BOTTOM_GAP,
-    ]);
+    expect(paddingBottomsAbove(action)).toEqual([BOTTOM_INSET + TAB_SCREEN_BOTTOM_GAP]);
 
     unmount();
   });
 
-  it('keeps the tab bar clearance a short keyboard does not cover', async () => {
+  it('keeps the footer clearance a short keyboard does not cover', async () => {
     const { renderer, unmount } = await renderScreen();
 
-    // The hardware-keyboard IME bar is one navigation bar tall; the footer keeps
-    // the difference so the action never lands behind the tab bar (e1-fill).
-    const keyboardLift = BOTTOM_INSET + BOTTOM_INSET;
+    // A keyboard shorter than the clearance leaves part of it uncovered; the
+    // footer keeps the difference so the action never lands behind the bottom
+    // edge (e1-fill).
+    const keyboardLift = BOTTOM_INSET;
     act(() => {
       keyboardStore.setHeight(keyboardLift);
     });
 
     const action = only(findAllOfType(renderer.root, 'Button'), 'primary action');
-    const footerClearance = getEffectiveTabBarHeight({
-      bottomInset: BOTTOM_INSET,
-      platform,
-      fontScale: 1,
-    });
     expect(paddingBottomsAbove(action)).toEqual([
-      footerClearance + TAB_SCREEN_BOTTOM_GAP - keyboardLift,
+      BOTTOM_INSET + TAB_SCREEN_BOTTOM_GAP - keyboardLift,
     ]);
 
     unmount();
@@ -298,11 +290,8 @@ describe.each(['android', 'ios'] as const)('ManualReviewScreen primary action on
     const button = only(findAllOfType(renderer.root, 'Button'), 'primary action');
     expect((button.props as { disabled: boolean }).disabled).toBe(true);
     // The footer is the sole clearance source now (the deleted lift layer is
-    // gone); at rest it reserves the tab bar height plus its final gap.
-    expect(paddingBottomsAbove(button)).toEqual([
-      getEffectiveTabBarHeight({ bottomInset: BOTTOM_INSET, platform, fontScale: 1 }) +
-        TAB_SCREEN_BOTTOM_GAP,
-    ]);
+    // gone); at rest it reserves the screen's bottom clearance plus its final gap.
+    expect(paddingBottomsAbove(button)).toEqual([BOTTOM_INSET + TAB_SCREEN_BOTTOM_GAP]);
     unmount();
   });
 
@@ -312,11 +301,8 @@ describe.each(['android', 'ios'] as const)('ManualReviewScreen primary action on
     const button = only(findAllOfType(renderer.root, 'Button'), 'primary action');
     expect((button.props as { loading: boolean }).loading).toBe(true);
     // The footer is the sole clearance source now (the deleted lift layer is
-    // gone); at rest it reserves the tab bar height plus its final gap.
-    expect(paddingBottomsAbove(button)).toEqual([
-      getEffectiveTabBarHeight({ bottomInset: BOTTOM_INSET, platform, fontScale: 1 }) +
-        TAB_SCREEN_BOTTOM_GAP,
-    ]);
+    // gone); at rest it reserves the screen's bottom clearance plus its final gap.
+    expect(paddingBottomsAbove(button)).toEqual([BOTTOM_INSET + TAB_SCREEN_BOTTOM_GAP]);
     unmount();
   });
 
@@ -348,9 +334,7 @@ describe.each(['android', 'ios'] as const)('ManualReviewScreen primary action on
     act(() => {
       action.props.onPress();
     });
-    expect(status.push).toHaveBeenCalledWith(
-      '/(app)/(tabs)/(3_profile)/code-reviewer/personal/github'
-    );
+    expect(status.push).toHaveBeenCalledWith('/(app)/code-reviewer/personal/github');
     expect(findAllOfType(renderer.root, 'ScrollView')).toHaveLength(0);
     unmount();
   });
diff --git a/apps/mobile/src/components/code-reviewer/manual-review-screen.tsx b/apps/mobile/src/components/code-reviewer/manual-review-screen.tsx
index a85317e7d99..18618ab2c6a 100644
--- a/apps/mobile/src/components/code-reviewer/manual-review-screen.tsx
+++ b/apps/mobile/src/components/code-reviewer/manual-review-screen.tsx
@@ -119,9 +119,7 @@ export function ManualReviewScreen({ scope }: Readonly<{ scope: string }>) {
           onSuccess: ({ reviewId }) => {
             settle(null);
             void Haptics.notificationAsync(Haptics.NotificationFeedbackType.Success);
-            router.replace(
-              `/(app)/(tabs)/(3_profile)/code-reviewer/${scope}/reviews/${reviewId}` as Href
-            );
+            router.replace(`/(app)/code-reviewer/${scope}/reviews/${reviewId}` as Href);
           },
           onError: error => {
             // A client-deadline rejection is the stall, not a server reason:
@@ -205,7 +203,7 @@ export function ManualReviewScreen({ scope }: Readonly<{ scope: string }>) {
             <Button
               className="mt-3 w-full"
               onPress={() => {
-                router.push(`/(app)/(tabs)/(3_profile)/code-reviewer/${scope}/github` as Href);
+                router.push(`/(app)/code-reviewer/${scope}/github` as Href);
               }}
             >
               <Text>{t('common.connectGithub')}</Text>
diff --git a/apps/mobile/src/components/code-reviewer/platform-list-screen.tsx b/apps/mobile/src/components/code-reviewer/platform-list-screen.tsx
index 5f23c3afb1f..91acfa03969 100644
--- a/apps/mobile/src/components/code-reviewer/platform-list-screen.tsx
+++ b/apps/mobile/src/components/code-reviewer/platform-list-screen.tsx
@@ -98,9 +98,7 @@ export function PlatformListScreen({ scope }: Readonly<{ scope: string }>) {
                   subtitle={connectionSubtitle(status)}
                   last={index === platforms.length - 1}
                   onPress={() => {
-                    router.push(
-                      `/(app)/(tabs)/(3_profile)/code-reviewer/${scope}/${platform}` as Href
-                    );
+                    router.push(`/(app)/code-reviewer/${scope}/${platform}` as Href);
                   }}
                 />
               );
@@ -117,7 +115,7 @@ export function PlatformListScreen({ scope }: Readonly<{ scope: string }>) {
               icon={History}
               title={t('codeReviewer.reviewList.title')}
               onPress={() => {
-                router.push(`/(app)/(tabs)/(3_profile)/code-reviewer/${scope}/reviews` as Href);
+                router.push(`/(app)/code-reviewer/${scope}/reviews` as Href);
               }}
             />
             <ConfigureRow
@@ -125,9 +123,7 @@ export function PlatformListScreen({ scope }: Readonly<{ scope: string }>) {
               title={t('codeReviewer.manualReview.title')}
               last
               onPress={() => {
-                router.push(
-                  `/(app)/(tabs)/(3_profile)/code-reviewer/${scope}/manual-review` as Href
-                );
+                router.push(`/(app)/code-reviewer/${scope}/manual-review` as Href);
               }}
             />
           </View>
diff --git a/apps/mobile/src/components/code-reviewer/platform-overview-screen.tsx b/apps/mobile/src/components/code-reviewer/platform-overview-screen.tsx
index 87fd297cbc8..70b66a023ac 100644
--- a/apps/mobile/src/components/code-reviewer/platform-overview-screen.tsx
+++ b/apps/mobile/src/components/code-reviewer/platform-overview-screen.tsx
@@ -162,7 +162,7 @@ export function PlatformOverviewScreen({
   }
 
   const pushField = (field: string) => {
-    router.push(`/(app)/(tabs)/(3_profile)/code-reviewer/${scope}/${platform}/${field}` as Href);
+    router.push(`/(app)/code-reviewer/${scope}/${platform}/${field}` as Href);
   };
 
   const data = config.data;
@@ -194,9 +194,7 @@ export function PlatformOverviewScreen({
           onOpenReviewMemory:
             platform === 'github'
               ? () => {
-                  router.push(
-                    `/(app)/(tabs)/(3_profile)/code-reviewer/${scope}/review-memory` as Href
-                  );
+                  router.push(`/(app)/code-reviewer/${scope}/review-memory` as Href);
                 }
               : undefined,
         });
diff --git a/apps/mobile/src/components/code-reviewer/review-detail-screen.mounted.test.tsx b/apps/mobile/src/components/code-reviewer/review-detail-screen.mounted.test.tsx
index c88d3403c00..6dbec517545 100644
--- a/apps/mobile/src/components/code-reviewer/review-detail-screen.mounted.test.tsx
+++ b/apps/mobile/src/components/code-reviewer/review-detail-screen.mounted.test.tsx
@@ -1354,9 +1354,7 @@ describe('ReviewDetailScreen retry when Code Reviewer cannot run', () => {
     act(() => {
       fixSettings?.onPress?.();
     });
-    expect(routerMock.push).toHaveBeenCalledWith(
-      '/(app)/(tabs)/(3_profile)/code-reviewer/personal/github'
-    );
+    expect(routerMock.push).toHaveBeenCalledWith('/(app)/code-reviewer/personal/github');
   });
 
   it('links to the settings when the configuration needs attention', () => {
diff --git a/apps/mobile/src/components/code-reviewer/review-detail-screen.tsx b/apps/mobile/src/components/code-reviewer/review-detail-screen.tsx
index ecf5f2e76a8..d41c0cd70e7 100644
--- a/apps/mobile/src/components/code-reviewer/review-detail-screen.tsx
+++ b/apps/mobile/src/components/code-reviewer/review-detail-screen.tsx
@@ -349,9 +349,7 @@ export function ReviewDetailScreen({
               <Button
                 variant="secondary"
                 onPress={() => {
-                  router.push(
-                    `/(app)/(tabs)/(3_profile)/code-reviewer/${scope}/${review.platform}` as Href
-                  );
+                  router.push(`/(app)/code-reviewer/${scope}/${review.platform}` as Href);
                 }}
               >
                 <Text>{t('codeReviewer.reviewDetail.fixSettings')}</Text>
diff --git a/apps/mobile/src/components/code-reviewer/review-list-screen.tsx b/apps/mobile/src/components/code-reviewer/review-list-screen.tsx
index 42063f41f2f..bb851309984 100644
--- a/apps/mobile/src/components/code-reviewer/review-list-screen.tsx
+++ b/apps/mobile/src/components/code-reviewer/review-list-screen.tsx
@@ -140,8 +140,8 @@ export function ReviewListScreen({ scope }: Readonly<{ scope: string }>) {
             onPress={() => {
               router.push(
                 (hasConnectedProvider
-                  ? `/(app)/(tabs)/(3_profile)/code-reviewer/${scope}/manual-review`
-                  : `/(app)/(tabs)/(3_profile)/code-reviewer/${scope}`) as Href
+                  ? `/(app)/code-reviewer/${scope}/manual-review`
+                  : `/(app)/code-reviewer/${scope}`) as Href
               );
             }}
           >
@@ -189,9 +189,7 @@ export function ReviewListScreen({ scope }: Readonly<{ scope: string }>) {
                 index < reviews.length - 1 && 'border-b-[0.5px] border-hair-soft'
               )}
               onPress={() => {
-                router.push(
-                  `/(app)/(tabs)/(3_profile)/code-reviewer/${scope}/reviews/${review.id}` as Href
-                );
+                router.push(`/(app)/code-reviewer/${scope}/reviews/${review.id}` as Href);
               }}
             >
               <Text className="text-sm font-medium" numberOfLines={1}>
diff --git a/apps/mobile/src/components/code-reviewer/scope-list-screen.tsx b/apps/mobile/src/components/code-reviewer/scope-list-screen.tsx
index 04fe9f8c901..200b9a0e470 100644
--- a/apps/mobile/src/components/code-reviewer/scope-list-screen.tsx
+++ b/apps/mobile/src/components/code-reviewer/scope-list-screen.tsx
@@ -25,7 +25,7 @@ export function ScopeListScreen() {
   } = useQuery(trpc.organizations.list.queryOptions());
 
   const openScope = (scope: string) => {
-    router.push(`/(app)/(tabs)/(3_profile)/code-reviewer/${scope}` as Href);
+    router.push(`/(app)/code-reviewer/${scope}` as Href);
   };
 
   return (
diff --git a/apps/mobile/src/components/security-agent/finding-detail-screen.analysis-crash.mounted.test.tsx b/apps/mobile/src/components/security-agent/finding-detail-screen.analysis-crash.mounted.test.tsx
index 749c73b8073..c37604673b6 100644
--- a/apps/mobile/src/components/security-agent/finding-detail-screen.analysis-crash.mounted.test.tsx
+++ b/apps/mobile/src/components/security-agent/finding-detail-screen.analysis-crash.mounted.test.tsx
@@ -112,7 +112,7 @@ vi.mock('@/lib/utils', () => ({
 
 type R = TestRenderer.ReactTestRenderer;
 let renderer: R | undefined = undefined;
-const detailPath = '/(app)/(tabs)/(3_profile)/security-agent/personal/findings/finding-1';
+const detailPath = '/(app)/security-agent/personal/findings/finding-1';
 
 function renderScreen(): R {
   const screen = createElement(FindingDetailScreen, { scope: 'personal', findingId: 'finding-1' });
diff --git a/apps/mobile/src/components/security-agent/finding-detail-screen.mounted.test.tsx b/apps/mobile/src/components/security-agent/finding-detail-screen.mounted.test.tsx
index 8ebb33b7a46..ae03e1c7182 100644
--- a/apps/mobile/src/components/security-agent/finding-detail-screen.mounted.test.tsx
+++ b/apps/mobile/src/components/security-agent/finding-detail-screen.mounted.test.tsx
@@ -121,7 +121,7 @@ vi.mock('@/lib/utils', () => ({
 
 type R = TestRenderer.ReactTestRenderer;
 let renderer: R | undefined = undefined;
-const scopeRoot = '/(app)/(tabs)/(3_profile)/security-agent/personal';
+const scopeRoot = '/(app)/security-agent/personal';
 const detailPath = `${scopeRoot}/findings/finding-1`;
 
 function renderScreen(): R {
diff --git a/apps/mobile/src/components/security-agent/finding-list-screen.mounted.test.tsx b/apps/mobile/src/components/security-agent/finding-list-screen.mounted.test.tsx
index 08e82b2be24..2a0fd88c44c 100644
--- a/apps/mobile/src/components/security-agent/finding-list-screen.mounted.test.tsx
+++ b/apps/mobile/src/components/security-agent/finding-list-screen.mounted.test.tsx
@@ -3,7 +3,7 @@ import { FlashList } from '@shopify/flash-list';
 import { act, type ComponentProps, createElement, type ReactElement, type ReactNode } from 'react';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import SecurityAgentFilterFindingsRoute from '@/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/filter';
+import SecurityAgentFilterFindingsRoute from '@/app/(app)/security-agent/[scope]/filter';
 import { Skeleton } from '@/components/ui/skeleton';
 import { PickerSheet } from '@/components/picker-sheet';
 import { EmptyState } from '@/components/empty-state';
diff --git a/apps/mobile/src/components/tab-screen.mounted.test.tsx b/apps/mobile/src/components/tab-screen.mounted.test.tsx
index 7f280294f8e..fec3069c67f 100644
--- a/apps/mobile/src/components/tab-screen.mounted.test.tsx
+++ b/apps/mobile/src/components/tab-screen.mounted.test.tsx
@@ -57,11 +57,17 @@ function Probe() {
   return createElement('Probe', { padding: useTabBarBottomPadding() });
 }
 
-/** The clearance `useTabBarBottomPadding` reserves under an optional label decision. */
-async function clearanceFor(showLabel: boolean | null): Promise<number> {
+/**
+ * The clearance `useTabBarBottomPadding` reserves under a tab-bar context:
+ * `true`/`false` are the tabs layout's label decisions, `null` is the root
+ * stack (no bar), `undefined` is a screen rendered under neither layout.
+ */
+async function clearanceFor(showLabel: boolean | null | undefined): Promise<number> {
   const probe = createElement(Probe);
   const ui =
-    showLabel === null ? probe : createElement(TabBarLabelContext, { value: showLabel }, probe);
+    showLabel === undefined
+      ? probe
+      : createElement(TabBarLabelContext, { value: showLabel }, probe);
   const mounted = await renderWithProviders(ui);
   try {
     return mounted.renderer.root.findByType('Probe').props.padding as number;
@@ -104,10 +110,17 @@ describe('tab screen bottom clearance', () => {
     );
   });
 
-  it('falls back to the font-scale rule outside the tabs navigator', async () => {
+  it('clears only the safe-area inset on a root-stack screen', async () => {
+    // The root stack draws no bar under its own screens, so their content
+    // clears the inset alone; a bar's height here would leave a blank strip.
     layout.fontScale = 2.5;
-    await expect(clearanceFor(null)).resolves.toBe(
-      getTabBarIconForwardHeight(layout.bottom, 'android') + TAB_SCREEN_BOTTOM_GAP
+    await expect(clearanceFor(null)).resolves.toBe(layout.bottom + TAB_SCREEN_BOTTOM_GAP);
+  });
+
+  it('keeps the font-scale rule for a screen rendered under neither layout', async () => {
+    layout.fontScale = 1.5;
+    await expect(clearanceFor(undefined)).resolves.toBe(
+      getTabBarOverlayHeight(layout.bottom, 'android', layout.fontScale) + TAB_SCREEN_BOTTOM_GAP
     );
   });
 });
@@ -122,7 +135,11 @@ describe('TabScreenScrollView', () => {
     layout.bottom = 34;
     layout.fontScale = 1;
     const { renderer, unmount } = await renderWithProviders(
-      createElement(TabScreenScrollView, null, createElement('Content'))
+      createElement(
+        TabBarLabelContext,
+        { value: true },
+        createElement(TabScreenScrollView, null, createElement('Content'))
+      )
     );
     const findByType = (type: string) =>
       renderer.root.findAll(node => typeof node.type === 'string' && node.type === type);
@@ -139,6 +156,25 @@ describe('TabScreenScrollView', () => {
     expect(spacer?.props.style).toEqual({ height: 16 });
     unmount();
   });
+
+  it('ends the viewport at the safe-area inset on a root-stack screen', async () => {
+    // No tabs navigator above this screen means no bar to end above, so the
+    // viewport clears the bottom inset alone instead of leaving a bar-height
+    // blank strip under the last row.
+    layout.platform = 'ios';
+    layout.bottom = 34;
+    layout.fontScale = 1;
+    const { renderer, unmount } = await renderWithProviders(
+      createElement(
+        TabBarLabelContext,
+        { value: null },
+        createElement(TabScreenScrollView, null, createElement('Content'))
+      )
+    );
+    const [scroll] = renderer.root.findAllByType('ScrollView', { deep: false });
+    expect(scroll?.props.style).toEqual([undefined, { marginBottom: 34 }]);
+    unmount();
+  });
 });
 
 describe('TabScreenScrollView keyboard occlusion', () => {
diff --git a/apps/mobile/src/components/tab-screen.tsx b/apps/mobile/src/components/tab-screen.tsx
index 5e0462f59d0..5552aa8cfe8 100644
--- a/apps/mobile/src/components/tab-screen.tsx
+++ b/apps/mobile/src/components/tab-screen.tsx
@@ -19,11 +19,11 @@ type ScrollEvent = NativeSyntheticEvent<NativeScrollEvent>;
 const TAB_SCREEN_BOTTOM_GAP = 16;
 
 /**
- * The tab bar's rendered height for this screen's clearance:
- * `useEffectiveTabBarHeight` supplies the tabs layout's label decision, the
- * safe-area bottom inset and the platform, so the clearance cannot drift from
- * the rendered bar height. Shared by the scroll viewport and by
- * `useTabBarBottomPadding`.
+ * The bottom chrome this screen clears: the tab bar's rendered height under the
+ * tabs navigator, or the safe-area inset alone on a root-stack screen, where no
+ * bar is drawn. `useEffectiveTabBarHeight` supplies the tabs layout's label
+ * decision, the inset and the platform, so the clearance cannot drift from what
+ * is on screen. Shared by the scroll viewport and by `useTabBarBottomPadding`.
  */
 function useTabBarHeight() {
   return useEffectiveTabBarHeight();
diff --git a/apps/mobile/src/lib/deep-link-handler.test.ts b/apps/mobile/src/lib/deep-link-handler.test.ts
index a942118eb66..5d02952f29f 100644
--- a/apps/mobile/src/lib/deep-link-handler.test.ts
+++ b/apps/mobile/src/lib/deep-link-handler.test.ts
@@ -71,15 +71,15 @@ const MAPPED_CASES = [
   },
   {
     path: 'https://app.kilo.ai/security-agent/findings',
-    href: '/(app)/(tabs)/(3_profile)/security-agent/personal/findings',
+    href: '/(app)/security-agent/personal/findings',
   },
   {
     path: 'https://app.kilo.ai/code-reviews/rev_9',
-    href: '/(app)/(tabs)/(3_profile)/code-reviewer/personal/reviews/rev_9',
+    href: '/(app)/code-reviewer/personal/reviews/rev_9',
   },
   {
     path: 'https://app.kilo.ai/organizations/org_1/code-reviews/rev_9',
-    href: '/(app)/(tabs)/(3_profile)/code-reviewer/org_1/reviews/rev_9',
+    href: '/(app)/code-reviewer/org_1/reviews/rev_9',
   },
 ] as const;
 
diff --git a/apps/mobile/src/lib/deep-link-launch.test.ts b/apps/mobile/src/lib/deep-link-launch.test.ts
index 262de2397d5..4d31845c358 100644
--- a/apps/mobile/src/lib/deep-link-launch.test.ts
+++ b/apps/mobile/src/lib/deep-link-launch.test.ts
@@ -705,9 +705,7 @@ describe('deep-link-launch', () => {
       _setGetLinkingURLForTests(() => 'https://app.kilo.ai/security-agent/findings');
       captureLaunchDeepLink();
       // Assert immediately — no await. The point of the test is synchronicity.
-      expect(getPendingDeepLink()).toBe(
-        '/(app)/(tabs)/(3_profile)/security-agent/personal/findings'
-      );
+      expect(getPendingDeepLink()).toBe('/(app)/security-agent/personal/findings');
     });
 
     it('carries the resume anchor of a cold launch URL into the stash', () => {
diff --git a/apps/mobile/src/lib/hooks/use-reviewer-permission.ts b/apps/mobile/src/lib/hooks/use-reviewer-permission.ts
index 616269b4224..59ff605076d 100644
--- a/apps/mobile/src/lib/hooks/use-reviewer-permission.ts
+++ b/apps/mobile/src/lib/hooks/use-reviewer-permission.ts
@@ -44,7 +44,7 @@ export function useReviewerEditGuard(scope: string, platform: ReviewerPlatform)
 
   useEffect(() => {
     if (readOnly) {
-      router.replace(`/(app)/(tabs)/(3_profile)/code-reviewer/${scope}/${platform}` as Href);
+      router.replace(`/(app)/code-reviewer/${scope}/${platform}` as Href);
     }
   }, [readOnly, router, scope, platform]);
 }
diff --git a/apps/mobile/src/lib/last-route.test.ts b/apps/mobile/src/lib/last-route.test.ts
index f787b9435c4..da46ec88ae0 100644
--- a/apps/mobile/src/lib/last-route.test.ts
+++ b/apps/mobile/src/lib/last-route.test.ts
@@ -217,6 +217,25 @@ describe('subscribeLastRoute (the restart read)', () => {
     expect(consumeLastRouteForRepair('u1')).toBeNull();
   });
 
+  it.each([
+    [
+      '/(app)/(tabs)/(3_profile)/code-reviewer/personal/reviews',
+      '/(app)/code-reviewer/personal/reviews',
+    ],
+    [
+      '/(app)/(tabs)/(3_profile)/security-agent/org-1/findings/f_1',
+      '/(app)/security-agent/org-1/findings/f_1',
+    ],
+  ])('rehydrates a %s record at the path the screen has now', async (stored, current) => {
+    // Mirrored before the Code Reviewer and Security Agent surfaces moved out of
+    // the Profile tab: replaying the old href after the update opens an
+    // unmatched route, so the record is read at the screen's current path.
+    store.set(KEY, recordFor(stored, 'u1'));
+    await _hydrateLastRouteForTests();
+
+    expect(getLastRoute('u1')).toBe(current);
+  });
+
   it('a record written during the restart read owns the state', async () => {
     const gate = Promise.withResolvers<undefined>();
     secureStoreMock.getItemAsync.mockImplementationOnce(async () => {
diff --git a/apps/mobile/src/lib/last-route.ts b/apps/mobile/src/lib/last-route.ts
index b092dd20bf5..820118bd33b 100644
--- a/apps/mobile/src/lib/last-route.ts
+++ b/apps/mobile/src/lib/last-route.ts
@@ -75,6 +75,26 @@ function notify(): void {
 }
 
 /** Parse a stored record; a corrupt, unreadable, or placeholder-bearing mirror reads as absent. */
+/**
+ * Routes that moved out of a tab stack into the root stack. A record mirrored
+ * by an older build still names the old stack; replaying it would open an
+ * unmatched route after the update, so the parse maps it to where the screen
+ * lives now.
+ */
+const MOVED_ROUTE_PREFIXES: readonly (readonly [string, string])[] = [
+  ['/(app)/(tabs)/(3_profile)/code-reviewer', '/(app)/code-reviewer'],
+  ['/(app)/(tabs)/(3_profile)/security-agent', '/(app)/security-agent'],
+];
+
+function currentRouteHref(href: string): string {
+  for (const [from, to] of MOVED_ROUTE_PREFIXES) {
+    if (href === from || href.startsWith(`${from}/`) || href.startsWith(`${from}?`)) {
+      return `${to}${href.slice(from.length)}`;
+    }
+  }
+  return href;
+}
+
 function parseStoredRecord(raw: string): LastRouteRecord | null {
   try {
     const result = lastRouteSchema.safeParse(JSON.parse(raw));
@@ -84,7 +104,8 @@ function parseStoredRecord(raw: string): LastRouteRecord | null {
     // A record written before hrefs were concrete names a route pattern
     // (`profiles/[profileId]/variables`); restoring it opens a screen whose
     // data reads cannot resolve, so it is dropped instead of replayed once.
-    return isConcreteLastRouteHref(result.data.href) ? result.data : null;
+    const href = currentRouteHref(result.data.href);
+    return isConcreteLastRouteHref(href) ? { ...result.data, href } : null;
   } catch {
     return null;
   }
diff --git a/apps/mobile/src/lib/notification-actions.test.ts b/apps/mobile/src/lib/notification-actions.test.ts
index 0bef3f5a3da..dd8d10f0731 100644
--- a/apps/mobile/src/lib/notification-actions.test.ts
+++ b/apps/mobile/src/lib/notification-actions.test.ts
@@ -717,7 +717,7 @@ describe('handleNeedsInputNotificationResponse — session organization', () =>
     );
 
     expect(consumePendingDeepLink()).toEqual({
-      href: '/(app)/(tabs)/(3_profile)/security-agent/personal/findings/f1?via=push',
+      href: '/(app)/security-agent/personal/findings/f1?via=push',
       organizationId: null,
     });
   });
diff --git a/apps/mobile/src/lib/notification-path-schema.test.ts b/apps/mobile/src/lib/notification-path-schema.test.ts
index 08eee6c8060..b445ca3351c 100644
--- a/apps/mobile/src/lib/notification-path-schema.test.ts
+++ b/apps/mobile/src/lib/notification-path-schema.test.ts
@@ -93,7 +93,7 @@ describe('pushDataSchema', () => {
       scope: 'personal',
     });
     expect(notificationPathForData(personalFinding)).toBe(
-      '/(app)/(tabs)/(3_profile)/security-agent/personal/findings/f-parsed?via=push'
+      '/(app)/security-agent/personal/findings/f-parsed?via=push'
     );
 
     const orgFinding = pushDataSchema.parse({
@@ -102,7 +102,7 @@ describe('pushDataSchema', () => {
       scope: 'org-99',
     });
     expect(notificationPathForData(orgFinding)).toBe(
-      '/(app)/(tabs)/(3_profile)/security-agent/org-99/findings/f-org?via=push'
+      '/(app)/security-agent/org-99/findings/f-org?via=push'
     );
   });
 
diff --git a/apps/mobile/src/lib/notification-path.test.ts b/apps/mobile/src/lib/notification-path.test.ts
index 6a639edb37d..2ec7a0d9940 100644
--- a/apps/mobile/src/lib/notification-path.test.ts
+++ b/apps/mobile/src/lib/notification-path.test.ts
@@ -169,7 +169,7 @@ describe('notificationPathForData', () => {
         findingId: 'finding-1',
         scope: 'personal',
       })
-    ).toBe('/(app)/(tabs)/(3_profile)/security-agent/personal/findings/finding-1?via=push');
+    ).toBe('/(app)/security-agent/personal/findings/finding-1?via=push');
   });
 
   it('routes security_finding notifications for an organization scope', () => {
@@ -179,7 +179,7 @@ describe('notificationPathForData', () => {
         findingId: 'finding-2',
         scope: 'org-xyz',
       })
-    ).toBe('/(app)/(tabs)/(3_profile)/security-agent/org-xyz/findings/finding-2?via=push');
+    ).toBe('/(app)/security-agent/org-xyz/findings/finding-2?via=push');
   });
 
   it('routes every security_lifecycle event value to the finding detail path', () => {
@@ -202,7 +202,7 @@ describe('notificationPathForData', () => {
           findingId: 'finding-3',
           scope: 'personal',
         })
-      ).toBe('/(app)/(tabs)/(3_profile)/security-agent/personal/findings/finding-3?via=push');
+      ).toBe('/(app)/security-agent/personal/findings/finding-3?via=push');
     }
   });
 
@@ -214,6 +214,6 @@ describe('notificationPathForData', () => {
         findingId: 'finding-4',
         scope: 'org-xyz',
       })
-    ).toBe('/(app)/(tabs)/(3_profile)/security-agent/org-xyz/findings/finding-4?via=push');
+    ).toBe('/(app)/security-agent/org-xyz/findings/finding-4?via=push');
   });
 });
diff --git a/apps/mobile/src/lib/notifications.test.ts b/apps/mobile/src/lib/notifications.test.ts
index c8d48c58e98..fbb3f1bb9d3 100644
--- a/apps/mobile/src/lib/notifications.test.ts
+++ b/apps/mobile/src/lib/notifications.test.ts
@@ -707,7 +707,7 @@ const securityResponses = ['personal', 'org-example'].flatMap(scope =>
     ] as const
   ).map(payload => ({
     data: { ...payload, scope, findingId: 'finding-123' } satisfies Notifications.PushData,
-    path: `/(app)/(tabs)/(3_profile)/security-agent/${scope}/findings/finding-123?via=push`,
+    path: `/(app)/security-agent/${scope}/findings/finding-123?via=push`,
   }))
 );
 const responseCases = [
diff --git a/apps/mobile/src/lib/pending-navigation.test.ts b/apps/mobile/src/lib/pending-navigation.test.ts
index bd0c2aa085a..4c98995b498 100644
--- a/apps/mobile/src/lib/pending-navigation.test.ts
+++ b/apps/mobile/src/lib/pending-navigation.test.ts
@@ -16,10 +16,8 @@ describe('pending navigation', () => {
   });
 
   it('anchors a review deep link to its initial profile screen', () => {
-    expect(
-      resolvePendingNavigation('/(app)/(tabs)/(3_profile)/code-reviewer/personal/reviews/rev_9')
-    ).toEqual({
-      href: '/(app)/(tabs)/(3_profile)/code-reviewer/personal/reviews/rev_9',
+    expect(resolvePendingNavigation('/(app)/code-reviewer/personal/reviews/rev_9')).toEqual({
+      href: '/(app)/code-reviewer/personal/reviews/rev_9',
       method: 'navigate',
       withAnchor: true,
     });
diff --git a/apps/mobile/src/lib/profile-agent-navigation.test.ts b/apps/mobile/src/lib/profile-agent-navigation.test.ts
index 9c9fe85bb21..2e3e856d7d2 100644
--- a/apps/mobile/src/lib/profile-agent-navigation.test.ts
+++ b/apps/mobile/src/lib/profile-agent-navigation.test.ts
@@ -40,16 +40,10 @@ describe('getProfileAgentScope', () => {
 
 describe('Profile agent paths', () => {
   it('builds direct Code Reviewer and Security Agent routes for a scope', () => {
-    expect(getCodeReviewerProfilePath('personal')).toBe(
-      '/(app)/(tabs)/(3_profile)/code-reviewer/personal'
-    );
-    expect(getCodeReviewerProfilePath('org-1')).toBe(
-      '/(app)/(tabs)/(3_profile)/code-reviewer/org-1'
-    );
-    expect(getSecurityAgentPath('personal')).toBe(
-      '/(app)/(tabs)/(3_profile)/security-agent/personal'
-    );
-    expect(getSecurityAgentPath('org-1')).toBe('/(app)/(tabs)/(3_profile)/security-agent/org-1');
+    expect(getCodeReviewerProfilePath('personal')).toBe('/(app)/code-reviewer/personal');
+    expect(getCodeReviewerProfilePath('org-1')).toBe('/(app)/code-reviewer/org-1');
+    expect(getSecurityAgentPath('personal')).toBe('/(app)/security-agent/personal');
+    expect(getSecurityAgentPath('org-1')).toBe('/(app)/security-agent/org-1');
   });
 });
 
diff --git a/apps/mobile/src/lib/profile-agent-navigation.ts b/apps/mobile/src/lib/profile-agent-navigation.ts
index 5239025db5f..7acc1913252 100644
--- a/apps/mobile/src/lib/profile-agent-navigation.ts
+++ b/apps/mobile/src/lib/profile-agent-navigation.ts
@@ -20,7 +20,7 @@ export function getProfileAgentScope(
 }
 
 export function getCodeReviewerProfilePath(scope: string): Href {
-  return `/(app)/(tabs)/(3_profile)/code-reviewer/${scope}` as Href;
+  return `/(app)/code-reviewer/${scope}` as Href;
 }
 
 export function getPrReviewEntryPath(): Href {
diff --git a/apps/mobile/src/lib/security-agent.test.ts b/apps/mobile/src/lib/security-agent.test.ts
index 457bdf83e67..0ebc8b3cdcf 100644
--- a/apps/mobile/src/lib/security-agent.test.ts
+++ b/apps/mobile/src/lib/security-agent.test.ts
@@ -5,10 +5,10 @@ import { getSecurityAgentPath } from '@/lib/security-agent';
 describe('Security Agent helpers', () => {
   it('builds personal and organization routes', () => {
     expect(getSecurityAgentPath('personal', 'findings')).toBe(
-      '/(app)/(tabs)/(3_profile)/security-agent/personal/findings'
+      '/(app)/security-agent/personal/findings'
     );
     expect(getSecurityAgentPath('org_123', 'settings/automation')).toBe(
-      '/(app)/(tabs)/(3_profile)/security-agent/org_123/settings/automation'
+      '/(app)/security-agent/org_123/settings/automation'
     );
   });
 });
diff --git a/apps/mobile/src/lib/security-agent.ts b/apps/mobile/src/lib/security-agent.ts
index 98d280b15dd..5be68444a12 100644
--- a/apps/mobile/src/lib/security-agent.ts
+++ b/apps/mobile/src/lib/security-agent.ts
@@ -25,7 +25,7 @@ export type SecurityCommand = NonNullable<RouterOutputs['securityAgent']['getCom
 export type SecurityCommandBatch = RouterOutputs['securityAgent']['getCommandStatuses'];
 
 export function getSecurityAgentPath(scope: string, suffix = ''): Href {
-  const path = `/(app)/(tabs)/(3_profile)/security-agent/${scope}`;
+  const path = `/(app)/security-agent/${scope}`;
   return (suffix ? `${path}/${suffix}` : path) as Href;
 }
 
diff --git a/apps/mobile/src/lib/security-notification-navigation.mounted.test.tsx b/apps/mobile/src/lib/security-notification-navigation.mounted.test.tsx
index 3536663e00d..e5424c58d71 100644
--- a/apps/mobile/src/lib/security-notification-navigation.mounted.test.tsx
+++ b/apps/mobile/src/lib/security-notification-navigation.mounted.test.tsx
@@ -7,7 +7,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { type PushData } from '@kilocode/notifications';
 
-import SecurityAgentScopeLayout from '@/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/_layout';
+import SecurityAgentScopeLayout from '@/app/(app)/security-agent/[scope]/_layout';
 import { InvalidRouteState } from '@/components/invalid-route-state';
 import { notificationPathForData } from './notification-path';
 
@@ -134,9 +134,7 @@ describe.each(['personal', 'org-example'])('security notification history (%s)',
 
     const data = { ...payload, scope, findingId: 'finding-123' } satisfies PushData;
     const path = notificationPathForData(data);
-    expect(path).toBe(
-      `/(app)/(tabs)/(3_profile)/security-agent/${scope}/findings/finding-123?via=push`
-    );
+    expect(path).toBe(`/(app)/security-agent/${scope}/findings/finding-123?via=push`);
     const url = new URL(path, 'https://example.test');
     const segments = url.pathname.split('/');
     const action = {
@@ -188,7 +186,7 @@ it.each([{ scope: undefined }, { scope: '' }, { scope: ['personal', 'org-example
   ({ scope }) => {
     const tree = mountScope(scope);
     expect(tree.root.findByType(InvalidRouteState).props).toMatchObject({
-      backTo: '/(app)/(tabs)/(3_profile)/security-agent',
+      backTo: '/(app)/security-agent',
     });
     expect(captured.stack).toBeUndefined();
   }
diff --git a/apps/mobile/src/lib/system-search-collect.test.ts b/apps/mobile/src/lib/system-search-collect.test.ts
index 72e80ea3bb8..b168b492041 100644
--- a/apps/mobile/src/lib/system-search-collect.test.ts
+++ b/apps/mobile/src/lib/system-search-collect.test.ts
@@ -239,13 +239,13 @@ describe('collectSystemSearchDocuments', () => {
         keywords: ['octocat/hello-world', '42'],
       },
       {
-        id: '/(app)/(tabs)/(3_profile)/security-agent/personal/findings/finding-1',
+        id: '/(app)/security-agent/personal/findings/finding-1',
         title: 'SQL injection',
         description: 'acme/api · critical',
         keywords: ['acme/api', 'critical'],
       },
       {
-        id: '/(app)/(tabs)/(3_profile)/security-agent/org-1/findings/finding-2',
+        id: '/(app)/security-agent/org-1/findings/finding-2',
         title: 'XSS',
         description: 'acme/web · high',
         keywords: ['acme/web', 'high'],
@@ -362,7 +362,7 @@ describe('collectSystemSearchDocuments', () => {
     const { documents, observedSources } = await collectSystemSearchDocuments(client);
 
     expect(documents.map(document => document.id)).toEqual([
-      '/(app)/(tabs)/(3_profile)/security-agent/personal/findings/finding-1',
+      '/(app)/security-agent/personal/findings/finding-1',
     ]);
     expect(observedSources.has('findings:personal')).toBe(false);
   });
diff --git a/apps/mobile/src/lib/system-search-entries.test.ts b/apps/mobile/src/lib/system-search-entries.test.ts
index b01514168be..e17e88e9c56 100644
--- a/apps/mobile/src/lib/system-search-entries.test.ts
+++ b/apps/mobile/src/lib/system-search-entries.test.ts
@@ -213,9 +213,7 @@ describe('finding documents', () => {
       'personal'
     );
 
-    expect(document.id).toBe(
-      '/(app)/(tabs)/(3_profile)/security-agent/personal/findings/finding-1'
-    );
+    expect(document.id).toBe('/(app)/security-agent/personal/findings/finding-1');
     expect(document.description).toBe('acme/api · critical');
     expect(document.keywords).toEqual(['acme/api', 'critical']);
     expect(document.route).toBe('kiloapp://security-agent/personal/findings/finding-1');
@@ -227,7 +225,7 @@ describe('finding documents', () => {
       'org-1'
     );
 
-    expect(document.id).toBe('/(app)/(tabs)/(3_profile)/security-agent/org-1/findings/finding-2');
+    expect(document.id).toBe('/(app)/security-agent/org-1/findings/finding-2');
   });
 
   it('omits a missing severity from the description', () => {
@@ -497,9 +495,9 @@ describe('systemSearchSourceKeysOfId', () => {
     expect(systemSearchSourceKeysOfId('/(app)/pr-review/gitlab/group/repo/12')).toEqual([
       systemSearchSourceKey('pullRequests', 'gitlab'),
     ]);
-    expect(
-      systemSearchSourceKeysOfId('/(app)/(tabs)/(3_profile)/security-agent/org-1/findings/f-2')
-    ).toEqual([systemSearchSourceKey('findings', 'org-1')]);
+    expect(systemSearchSourceKeysOfId('/(app)/security-agent/org-1/findings/f-2')).toEqual([
+      systemSearchSourceKey('findings', 'org-1'),
+    ]);
   });
 
   it('returns no source for an identifier this section did not issue', () => {
@@ -513,7 +511,7 @@ describe('systemSearchHrefFromId', () => {
     const ids = [
       '/(app)/agent-chat/sess-1?organizationId=org-1',
       '/(app)/pr-review/octocat/hello-world/42',
-      '/(app)/(tabs)/(3_profile)/security-agent/personal/findings/finding-1',
+      '/(app)/security-agent/personal/findings/finding-1',
     ];
 
     for (const id of ids) {
@@ -534,14 +532,8 @@ describe('systemSearchHrefFromId', () => {
     expect(systemSearchHrefFromId('/(app)/agent-chat/sess-1/extra')).toBeNull();
     expect(systemSearchHrefFromId('/(app)/pr-review/../../settings')).toBeNull();
     expect(systemSearchHrefFromId('/(app)/pr-review/a/../b')).toBeNull();
-    expect(
-      systemSearchHrefFromId(
-        '/(app)/(tabs)/(3_profile)/security-agent/personal/findings/f-1/../f-2'
-      )
-    ).toBeNull();
-    expect(
-      systemSearchHrefFromId('/(app)/(tabs)/(3_profile)/security-agent/personal/nope/f-1')
-    ).toBeNull();
+    expect(systemSearchHrefFromId('/(app)/security-agent/personal/findings/f-1/../f-2')).toBeNull();
+    expect(systemSearchHrefFromId('/(app)/security-agent/personal/nope/f-1')).toBeNull();
   });
 
   it('accepts every id the builders produce', () => {
@@ -565,11 +557,9 @@ describe('systemSearchDeeplinkFromId', () => {
     expect(systemSearchDeeplinkFromId('/(app)/pr-review/octocat/hello-world/42')).toBe(
       'kiloapp://pr-review/octocat/hello-world/42'
     );
-    expect(
-      systemSearchDeeplinkFromId(
-        '/(app)/(tabs)/(3_profile)/security-agent/personal/findings/finding-1'
-      )
-    ).toBe('kiloapp://security-agent/personal/findings/finding-1');
+    expect(systemSearchDeeplinkFromId('/(app)/security-agent/personal/findings/finding-1')).toBe(
+      'kiloapp://security-agent/personal/findings/finding-1'
+    );
   });
 
   it('returns null for an unrecognised identifier', () => {
diff --git a/apps/mobile/src/lib/system-search-entries.ts b/apps/mobile/src/lib/system-search-entries.ts
index 91a3d8e2dec..c216bac1605 100644
--- a/apps/mobile/src/lib/system-search-entries.ts
+++ b/apps/mobile/src/lib/system-search-entries.ts
@@ -89,7 +89,7 @@ const ROUTE_ID_PATTERNS: readonly RegExp[] = [
   new RegExp(String.raw`^/\(app\)/agent-chat/${ID_SEGMENT}(?:\?[^#]*)?$`),
   new RegExp(String.raw`^/\(app\)/pr-review/${ID_SEGMENT}(?:/${ID_SEGMENT})*(?:\?[^#]*)?$`),
   new RegExp(
-    String.raw`^/\(app\)/\(tabs\)/\(3_profile\)/security-agent/${ID_SEGMENT}/findings/${ID_SEGMENT}(?:\?[^#]*)?$`
+    String.raw`^/\(app\)/security-agent/${ID_SEGMENT}/findings/${ID_SEGMENT}(?:\?[^#]*)?$`
   ),
 ];
 
@@ -440,9 +440,9 @@ function findingScopeOfId(id: string): string | null {
 }
 
 /**
- * The id as a link the OS can hand back to the app. Expo Router groups
- * (`(app)`, `(tabs)/(3_profile)`) are app-internal and never appear in a
- * deeplink, so they are stripped; null for an unrecognised id.
+ * The id as a link the OS can hand back to the app. The Expo Router group
+ * (`(app)`) is app-internal and never appears in a deeplink, so it is
+ * stripped; null for an unrecognised id.
  */
 export function systemSearchDeeplinkFromId(id: string): string | null {
   if (systemSearchHrefFromId(id) === null) {
diff --git a/apps/mobile/src/lib/system-search-families.ts b/apps/mobile/src/lib/system-search-families.ts
index d45c958fd3c..46bc819a5e6 100644
--- a/apps/mobile/src/lib/system-search-families.ts
+++ b/apps/mobile/src/lib/system-search-families.ts
@@ -12,21 +12,17 @@
 /** The in-app route prefix of each indexed family, in read-back order. */
 export const SESSION_HREF_PREFIX = '/(app)/agent-chat/';
 export const PULL_REQUEST_HREF_PREFIX = '/(app)/pr-review/';
-export const FINDING_HREF_PREFIX = '/(app)/(tabs)/(3_profile)/security-agent/';
+export const FINDING_HREF_PREFIX = '/(app)/security-agent/';
 
 /** The app-scheme prefix every deeplink carries. */
 export const APP_SCHEME = 'kiloapp://';
 
-/** The group segments a deeplink drops: `(app)` and the profile tab group. */
+/** The group segment a deeplink drops: `(app)`. */
 const APP_GROUP_PREFIX = '/(app)/';
-const PROFILE_TABS_GROUP_PREFIX = '(tabs)/(3_profile)/';
 
-/** An in-app href with the app-internal group segments dropped. */
+/** An in-app href with the app-internal group segment dropped. */
 export function deeplinkPathFromHref(href: string): string {
-  const withoutAppGroup = href.slice(APP_GROUP_PREFIX.length);
-  return withoutAppGroup.startsWith(PROFILE_TABS_GROUP_PREFIX)
-    ? withoutAppGroup.slice(PROFILE_TABS_GROUP_PREFIX.length)
-    : withoutAppGroup;
+  return href.slice(APP_GROUP_PREFIX.length);
 }
 
 /** The deeplink path of each indexed family, in the id order. */
diff --git a/apps/mobile/src/lib/system-search-route.test.ts b/apps/mobile/src/lib/system-search-route.test.ts
index 0932c71f51d..6d63423ec78 100644
--- a/apps/mobile/src/lib/system-search-route.test.ts
+++ b/apps/mobile/src/lib/system-search-route.test.ts
@@ -68,7 +68,7 @@ import {
 
 const SESSION_ID = '/(app)/agent-chat/session-1';
 const PR_ID = '/(app)/pr-review/owner/repo/42';
-const FINDING_ID = '/(app)/(tabs)/(3_profile)/security-agent/personal/findings/finding-1';
+const FINDING_ID = '/(app)/security-agent/personal/findings/finding-1';
 
 /** The source of the durable record, the only place the source is observable. */
 function persistedSource(): string | null {
diff --git a/apps/mobile/src/lib/tab-bar-clearance.ts b/apps/mobile/src/lib/tab-bar-clearance.ts
index 366b83eda32..7566d3e058d 100644
--- a/apps/mobile/src/lib/tab-bar-clearance.ts
+++ b/apps/mobile/src/lib/tab-bar-clearance.ts
@@ -5,25 +5,34 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { getEffectiveTabBarHeight } from '@/lib/tab-bar-layout';
 
 /**
- * The tab layout's label decision for the current window, published to the tab
- * screens so their content clearance matches the rendered bar height. The
- * decision turns on the window width, which a clearance caller cannot see from
- * `fontScale` alone: without it a caller reserves the label-inclusive height
- * while the bar renders compact (labels dropped for width). `null` outside the
- * tabs navigator, where `getEffectiveTabBarHeight` keeps its font-scale-only
- * default.
+ * Whether a tab bar sits under the screen, and — when it does — the tab layout's
+ * label decision for the current window, published so content clearance matches
+ * the rendered bar height. The decision turns on the window width, which a
+ * clearance caller cannot see from `fontScale` alone: without it a caller
+ * reserves the label-inclusive height while the bar renders compact (labels
+ * dropped for width).
+ *
+ * - a boolean is the tabs layout's answer for the window;
+ * - `null` is the app's root stack, which draws no bar above the tabs and no
+ *   bar under its own screens;
+ * - `undefined` is a screen rendered without either layout (a mounted test of
+ *   a tab screen), which keeps the font-scale default.
  */
-export const TabBarLabelContext = createContext<boolean | null>(null);
+export const TabBarLabelContext = createContext<boolean | null | undefined>(undefined);
 
 /**
- * Effective rendered tab bar height for a screen's content clearance: the tabs
+ * Effective rendered tab bar height for a screen's content clearance: the tab
  * layout's label decision (`TabBarLabelContext`), the safe-area bottom inset and
- * the platform.
+ * the platform. A root-stack screen has no bar under it, so it clears the
+ * safe-area inset alone instead of reserving a bar that is not on screen.
  */
 export function useEffectiveTabBarHeight(): number {
   const { bottom } = useSafeAreaInsets();
   const { fontScale } = useWindowDimensions();
-  const showLabel = useContext(TabBarLabelContext) ?? undefined;
+  const showLabel = useContext(TabBarLabelContext);
+  if (showLabel === null) {
+    return bottom;
+  }
   return getEffectiveTabBarHeight({
     bottomInset: bottom,
     platform: Platform.OS,
diff --git a/apps/mobile/src/lib/tab-press.test.ts b/apps/mobile/src/lib/tab-press.test.ts
index eacb7e9f9c6..840564351aa 100644
--- a/apps/mobile/src/lib/tab-press.test.ts
+++ b/apps/mobile/src/lib/tab-press.test.ts
@@ -30,15 +30,13 @@ describe('isFormSheetRoute', () => {
   });
 
   it('matches a dynamic sheet route by its pattern segments', () => {
-    expect(
-      isFormSheetRoute([...PROFILE_SEGMENTS, 'security-agent', '[scope]', 'dismiss', '[id]'])
-    ).toBe(true);
+    expect(isFormSheetRoute(['(app)', 'security-agent', '[scope]', 'dismiss', '[id]'])).toBe(true);
   });
 
   it('does not match a plain dynamic route that shares the pattern leaf', () => {
-    expect(
-      isFormSheetRoute([...PROFILE_SEGMENTS, 'security-agent', '[scope]', 'findings', '[id]'])
-    ).toBe(false);
+    expect(isFormSheetRoute(['(app)', 'security-agent', '[scope]', 'findings', '[id]'])).toBe(
+      false
+    );
   });
 
   it('does not match a shorter route than the suffix', () => {
@@ -61,7 +59,7 @@ describe('planProfileTabPress', () => {
     expect(
       planProfileTabPress({
         profileFocused: true,
-        segments: [...PROFILE_SEGMENTS, 'security-agent', '[scope]', 'settings', 'automation'],
+        segments: [...PROFILE_SEGMENTS, 'organization', 'members'],
         profileStackIndex: 1,
       })
     ).toBe('reset-to-root');
diff --git a/packages/app-shared/src/universal-links/routes.test.ts b/packages/app-shared/src/universal-links/routes.test.ts
index 6ad62e47b08..350b9910313 100644
--- a/packages/app-shared/src/universal-links/routes.test.ts
+++ b/packages/app-shared/src/universal-links/routes.test.ts
@@ -39,35 +39,35 @@ const ROW_CASES = [
   },
   {
     path: '/security-agent',
-    app: '/(app)/(tabs)/(3_profile)/security-agent/personal',
+    app: '/(app)/security-agent/personal',
   },
   {
     path: '/security-agent/findings',
-    app: '/(app)/(tabs)/(3_profile)/security-agent/personal/findings',
+    app: '/(app)/security-agent/personal/findings',
   },
   {
     path: '/code-reviews',
-    app: '/(app)/(tabs)/(3_profile)/code-reviewer/personal',
+    app: '/(app)/code-reviewer/personal',
   },
   {
     path: '/code-reviews/rev_9',
-    app: '/(app)/(tabs)/(3_profile)/code-reviewer/personal/reviews/rev_9',
+    app: '/(app)/code-reviewer/personal/reviews/rev_9',
   },
   {
     path: '/organizations/org_123/security-agent',
-    app: '/(app)/(tabs)/(3_profile)/security-agent/org_123',
+    app: '/(app)/security-agent/org_123',
   },
   {
     path: '/organizations/org_123/security-agent/findings',
-    app: '/(app)/(tabs)/(3_profile)/security-agent/org_123/findings',
+    app: '/(app)/security-agent/org_123/findings',
   },
   {
     path: '/organizations/org_123/code-reviews',
-    app: '/(app)/(tabs)/(3_profile)/code-reviewer/org_123',
+    app: '/(app)/code-reviewer/org_123',
   },
   {
     path: '/organizations/org_123/code-reviews/rev_9',
-    app: '/(app)/(tabs)/(3_profile)/code-reviewer/org_123/reviews/rev_9',
+    app: '/(app)/code-reviewer/org_123/reviews/rev_9',
   },
   {
     path: '/organizations/org_123/overview',
@@ -114,7 +114,7 @@ describe('resolveIncomingUrl — kiloapp:// forms', () => {
 
   it('maps kiloapp://code-reviews/rev_9 (host + path as pathname)', () => {
     expect(resolveIncomingUrl('kiloapp://code-reviews/rev_9')).toBe(
-      '/(app)/(tabs)/(3_profile)/code-reviewer/personal/reviews/rev_9'
+      '/(app)/code-reviewer/personal/reviews/rev_9'
     );
   });
 
@@ -126,31 +126,31 @@ describe('resolveIncomingUrl — kiloapp:// forms', () => {
 describe('wildcard capture substitution', () => {
   it('row 7: /code-reviews/rev_9', () => {
     expect(resolveIncomingUrl(`${WEB}/code-reviews/rev_9`)).toBe(
-      '/(app)/(tabs)/(3_profile)/code-reviewer/personal/reviews/rev_9'
+      '/(app)/code-reviewer/personal/reviews/rev_9'
     );
   });
 
   it('row 8: /organizations/org_123/security-agent', () => {
     expect(resolveIncomingUrl(`${WEB}/organizations/org_123/security-agent`)).toBe(
-      '/(app)/(tabs)/(3_profile)/security-agent/org_123'
+      '/(app)/security-agent/org_123'
     );
   });
 
   it('row 9: /organizations/org_123/security-agent/findings', () => {
     expect(resolveIncomingUrl(`${WEB}/organizations/org_123/security-agent/findings`)).toBe(
-      '/(app)/(tabs)/(3_profile)/security-agent/org_123/findings'
+      '/(app)/security-agent/org_123/findings'
     );
   });
 
   it('row 10: /organizations/org_123/code-reviews', () => {
     expect(resolveIncomingUrl(`${WEB}/organizations/org_123/code-reviews`)).toBe(
-      '/(app)/(tabs)/(3_profile)/code-reviewer/org_123'
+      '/(app)/code-reviewer/org_123'
     );
   });
 
   it('row 11: /organizations/org_123/code-reviews/rev_9', () => {
     expect(resolveIncomingUrl(`${WEB}/organizations/org_123/code-reviews/rev_9`)).toBe(
-      '/(app)/(tabs)/(3_profile)/code-reviewer/org_123/reviews/rev_9'
+      '/(app)/code-reviewer/org_123/reviews/rev_9'
     );
   });
 
@@ -158,13 +158,13 @@ describe('wildcard capture substitution', () => {
     // String replacement would run ECMA-262 GetSubstitution on the capture:
     // `$&` re-inserts the placeholder, `$'` splices the un-substituted tail.
     expect(resolveIncomingUrl(`${WEB}/code-reviews/a$&b`)).toBe(
-      '/(app)/(tabs)/(3_profile)/code-reviewer/personal/reviews/a$&b'
+      '/(app)/code-reviewer/personal/reviews/a$&b'
     );
     expect(resolveIncomingUrl(`${WEB}/organizations/a$'b/code-reviews/rev_9`)).toBe(
-      "/(app)/(tabs)/(3_profile)/code-reviewer/a$'b/reviews/rev_9"
+      "/(app)/code-reviewer/a$'b/reviews/rev_9"
     );
     expect(resolveIncomingUrl(`${WEB}/organizations/a$b/code-reviews/rev_9`)).toBe(
-      '/(app)/(tabs)/(3_profile)/code-reviewer/a$b/reviews/rev_9'
+      '/(app)/code-reviewer/a$b/reviews/rev_9'
     );
   });
 
@@ -172,10 +172,10 @@ describe('wildcard capture substitution', () => {
     // Per-capture replaceAll passes would substitute the `<2>` inserted for
     // `<1>` again in pass 2. Single-pass substitution must not.
     expect(resolveIncomingUrl('kiloapp:///organizations/<2>/code-reviews/rev_9')).toBe(
-      '/(app)/(tabs)/(3_profile)/code-reviewer/<2>/reviews/rev_9'
+      '/(app)/code-reviewer/<2>/reviews/rev_9'
     );
     expect(resolveIncomingUrl('kiloapp:///organizations/org_1/code-reviews/<1>')).toBe(
-      '/(app)/(tabs)/(3_profile)/code-reviewer/org_1/reviews/<1>'
+      '/(app)/code-reviewer/org_1/reviews/<1>'
     );
   });
 });
diff --git a/packages/app-shared/src/universal-links/routes.ts b/packages/app-shared/src/universal-links/routes.ts
index 772f9c945e8..82e71320f76 100644
--- a/packages/app-shared/src/universal-links/routes.ts
+++ b/packages/app-shared/src/universal-links/routes.ts
@@ -32,36 +32,36 @@ export const UNIVERSAL_LINK_ROUTES: readonly UniversalLinkRoute[] = [
   { webPath: '/cloud/sessions/*', appPath: '/(app)/agent-chat/<1>' },
   {
     webPath: '/security-agent',
-    appPath: '/(app)/(tabs)/(3_profile)/security-agent/personal',
+    appPath: '/(app)/security-agent/personal',
   },
   {
     webPath: '/security-agent/findings',
-    appPath: '/(app)/(tabs)/(3_profile)/security-agent/personal/findings',
+    appPath: '/(app)/security-agent/personal/findings',
   },
   {
     webPath: '/code-reviews',
-    appPath: '/(app)/(tabs)/(3_profile)/code-reviewer/personal',
+    appPath: '/(app)/code-reviewer/personal',
   },
   {
     webPath: '/code-reviews/*',
-    appPath: '/(app)/(tabs)/(3_profile)/code-reviewer/personal/reviews/<1>',
+    appPath: '/(app)/code-reviewer/personal/reviews/<1>',
     exclusions: ['review-md'],
   },
   {
     webPath: '/organizations/*/security-agent',
-    appPath: '/(app)/(tabs)/(3_profile)/security-agent/<1>',
+    appPath: '/(app)/security-agent/<1>',
   },
   {
     webPath: '/organizations/*/security-agent/findings',
-    appPath: '/(app)/(tabs)/(3_profile)/security-agent/<1>/findings',
+    appPath: '/(app)/security-agent/<1>/findings',
   },
   {
     webPath: '/organizations/*/code-reviews',
-    appPath: '/(app)/(tabs)/(3_profile)/code-reviewer/<1>',
+    appPath: '/(app)/code-reviewer/<1>',
   },
   {
     webPath: '/organizations/*/code-reviews/*',
-    appPath: '/(app)/(tabs)/(3_profile)/code-reviewer/<1>/reviews/<2>',
+    appPath: '/(app)/code-reviewer/<1>/reviews/<2>',
     exclusions: ['review-md'],
   },
   {

From 7e6a5176c0fc02f7ddc14d08f4d2a05a2dab0344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20=C5=A0=C4=87eki=C4=87?=
 <4062236+iscekic@users.noreply.github.com>
Date: Wed, 21 Oct 2026 22:24:14 +0000
Subject: [PATCH 2/7] fix(mobile): resolve indexed ids from before the finding
 route moved

The phone's search index keeps an entry until the app removes it, and iOS
hands the indexed id back when the result is picked. Ids issued before the
finding route left the profile tab stack no longer matched the current
prefix, so such a result could not open its screen, and the sync could not
name the source that authorises removing it, leaving the stale entry in
place.

Canonicalise an indexed id to the route the app shows today before the
allowlist and the source lookup read it, so an older result opens the same
screen and the next sync replaces it.

Also restore the parse comment that sat above the moved-route table.
---
 apps/mobile/src/lib/last-route.ts             |  2 +-
 .../src/lib/system-search-entries.test.ts     | 48 +++++++++++++++++++
 apps/mobile/src/lib/system-search-entries.ts  | 33 ++++++++-----
 .../src/lib/system-search-families.test.ts    | 11 +++++
 apps/mobile/src/lib/system-search-families.ts | 20 ++++++++
 .../src/lib/system-search-route.test.ts       |  6 +++
 6 files changed, 106 insertions(+), 14 deletions(-)

diff --git a/apps/mobile/src/lib/last-route.ts b/apps/mobile/src/lib/last-route.ts
index 820118bd33b..3d9367d6504 100644
--- a/apps/mobile/src/lib/last-route.ts
+++ b/apps/mobile/src/lib/last-route.ts
@@ -74,7 +74,6 @@ function notify(): void {
   }
 }
 
-/** Parse a stored record; a corrupt, unreadable, or placeholder-bearing mirror reads as absent. */
 /**
  * Routes that moved out of a tab stack into the root stack. A record mirrored
  * by an older build still names the old stack; replaying it would open an
@@ -95,6 +94,7 @@ function currentRouteHref(href: string): string {
   return href;
 }
 
+/** Parse a stored record; a corrupt, unreadable, or placeholder-bearing mirror reads as absent. */
 function parseStoredRecord(raw: string): LastRouteRecord | null {
   try {
     const result = lastRouteSchema.safeParse(JSON.parse(raw));
diff --git a/apps/mobile/src/lib/system-search-entries.test.ts b/apps/mobile/src/lib/system-search-entries.test.ts
index e17e88e9c56..d21d1da612c 100644
--- a/apps/mobile/src/lib/system-search-entries.test.ts
+++ b/apps/mobile/src/lib/system-search-entries.test.ts
@@ -481,6 +481,54 @@ describe('planSystemSearchUpdate', () => {
   });
 });
 
+const LEGACY_FINDING_ID = '/(app)/(tabs)/(3_profile)/security-agent/org-1/findings/finding-1';
+
+describe('ids indexed before the finding route moved', () => {
+  it('resolves to the screen the app shows now', () => {
+    expect(systemSearchHrefFromId(LEGACY_FINDING_ID)).toBe(
+      '/(app)/security-agent/org-1/findings/finding-1'
+    );
+  });
+
+  it('still names the source whose enumeration may remove it', () => {
+    expect(systemSearchSourceKeysOfId(LEGACY_FINDING_ID)).toEqual([
+      systemSearchSourceKey('findings', 'org-1'),
+    ]);
+  });
+
+  it('hands the OS the same link the current id carries', () => {
+    expect(systemSearchDeeplinkFromId(LEGACY_FINDING_ID)).toBe(
+      'kiloapp://security-agent/org-1/findings/finding-1'
+    );
+  });
+
+  it('is removed and replaced once its source is enumerated', () => {
+    const legacy: SystemSearchDocument = {
+      id: LEGACY_FINDING_ID,
+      title: 'SQL injection',
+      description: 'acme/api · critical',
+      keywords: ['acme/api'],
+      route: 'kiloapp://security-agent/org-1/findings/finding-1',
+      // A fingerprint written before the move names no source, so the id alone
+      // decides which scope may remove it.
+      fingerprint: '{}',
+    };
+    const current = findingSearchDocument(
+      { id: 'finding-1', title: 'SQL injection', severity: 'critical', repo_full_name: 'acme/api' },
+      'org-1'
+    );
+
+    const plan = planSystemSearchUpdate({
+      indexed: [legacy],
+      documents: [current],
+      observedSources: new Set([systemSearchSourceKey('findings', 'org-1')]),
+    });
+
+    expect(plan.remove).toEqual([LEGACY_FINDING_ID]);
+    expect(plan.add).toEqual([current]);
+  });
+});
+
 describe('systemSearchSourceKeysOfId', () => {
   it('reads the scope out of each indexed id shape', () => {
     expect(systemSearchSourceKeysOfId('/(app)/agent-chat/sess-1?organizationId=org-1')).toEqual([
diff --git a/apps/mobile/src/lib/system-search-entries.ts b/apps/mobile/src/lib/system-search-entries.ts
index c216bac1605..97d021a8bfb 100644
--- a/apps/mobile/src/lib/system-search-entries.ts
+++ b/apps/mobile/src/lib/system-search-entries.ts
@@ -31,6 +31,7 @@ import { sessionDisplayTitle } from '@/lib/session-display-title';
 
 import {
   APP_SCHEME,
+  canonicalSystemSearchId,
   deeplinkPathFromHref,
   FINDING_HREF_PREFIX,
   PULL_REQUEST_HREF_PREFIX,
@@ -357,8 +358,11 @@ export function findingSearchDocument(
  * navigate.
  */
 export function systemSearchHrefFromId(id: string): string | null {
-  const known = ROUTE_ID_PATTERNS.some(pattern => pattern.test(id));
-  return known ? id : null;
+  // An id indexed before a route moved resolves to where the screen lives now;
+  // the OS hands the old id back until the next sync replaces the entry.
+  const canonical = canonicalSystemSearchId(id);
+  const known = ROUTE_ID_PATTERNS.some(pattern => pattern.test(canonical));
+  return known ? canonical : null;
 }
 
 /** The personal scope name shared by the session and finding sources. */
@@ -387,19 +391,24 @@ export function systemSearchSourceKey(family: SystemSearchFamily, scope: string)
  * cold start hydrates only some queries) is left in place.
  */
 export function systemSearchSourceKeysOfId(id: string): string[] {
-  if (systemSearchHrefFromId(id) === null) {
+  const href = systemSearchHrefFromId(id);
+  if (href === null) {
     return [];
   }
-  if (id.startsWith(SESSION_HREF_PREFIX)) {
+  const canonical = href;
+  if (canonical.startsWith(SESSION_HREF_PREFIX)) {
     return [
-      systemSearchSourceKey('sessions', organizationIdOfSessionId(id) ?? PERSONAL_SOURCE_SCOPE),
+      systemSearchSourceKey(
+        'sessions',
+        organizationIdOfSessionId(canonical) ?? PERSONAL_SOURCE_SCOPE
+      ),
     ];
   }
-  if (id.startsWith(PULL_REQUEST_HREF_PREFIX)) {
-    return [systemSearchSourceKey('pullRequests', providerOfPullRequestId(id))];
+  if (canonical.startsWith(PULL_REQUEST_HREF_PREFIX)) {
+    return [systemSearchSourceKey('pullRequests', providerOfPullRequestId(canonical))];
   }
-  if (id.startsWith(FINDING_HREF_PREFIX)) {
-    const scope = findingScopeOfId(id);
+  if (canonical.startsWith(FINDING_HREF_PREFIX)) {
+    const scope = findingScopeOfId(canonical);
     return scope === null ? [] : [systemSearchSourceKey('findings', scope)];
   }
   return [];
@@ -445,10 +454,8 @@ function findingScopeOfId(id: string): string | null {
  * stripped; null for an unrecognised id.
  */
 export function systemSearchDeeplinkFromId(id: string): string | null {
-  if (systemSearchHrefFromId(id) === null) {
-    return null;
-  }
-  return `${APP_SCHEME}${deeplinkPathFromHref(id)}`;
+  const href = systemSearchHrefFromId(id);
+  return href === null ? null : `${APP_SCHEME}${deeplinkPathFromHref(href)}`;
 }
 
 /**
diff --git a/apps/mobile/src/lib/system-search-families.test.ts b/apps/mobile/src/lib/system-search-families.test.ts
index e745bfc4af7..88599e7c62f 100644
--- a/apps/mobile/src/lib/system-search-families.test.ts
+++ b/apps/mobile/src/lib/system-search-families.test.ts
@@ -2,6 +2,7 @@ import { describe, expect, it } from 'vitest';
 
 import {
   APP_SCHEME,
+  canonicalSystemSearchId,
   deeplinkPathFromHref,
   FINDING_HREF_PREFIX,
   INDEXED_LINK_PREFIXES,
@@ -39,6 +40,16 @@ describe('isSystemSearchFamilyLink', () => {
     ]);
   });
 
+  it('maps an id indexed before a route moved to the current prefix', () => {
+    expect(
+      canonicalSystemSearchId('/(app)/(tabs)/(3_profile)/security-agent/org-1/findings/f-1')
+    ).toBe('/(app)/security-agent/org-1/findings/f-1');
+    expect(canonicalSystemSearchId('/(app)/security-agent/personal/findings/f-1')).toBe(
+      '/(app)/security-agent/personal/findings/f-1'
+    );
+    expect(canonicalSystemSearchId('/(app)/agent-chat/ses_1')).toBe('/(app)/agent-chat/ses_1');
+  });
+
   it('names the scheme the indexed links carry', () => {
     expect(APP_SCHEME).toBe('kiloapp://');
   });
diff --git a/apps/mobile/src/lib/system-search-families.ts b/apps/mobile/src/lib/system-search-families.ts
index 46bc819a5e6..b095308130d 100644
--- a/apps/mobile/src/lib/system-search-families.ts
+++ b/apps/mobile/src/lib/system-search-families.ts
@@ -14,6 +14,26 @@ export const SESSION_HREF_PREFIX = '/(app)/agent-chat/';
 export const PULL_REQUEST_HREF_PREFIX = '/(app)/pr-review/';
 export const FINDING_HREF_PREFIX = '/(app)/security-agent/';
 
+/**
+ * Prefixes of ids the app indexed before a family's route moved. The OS keeps
+ * an entry until the app removes it, and a result picked before the next sync
+ * is handed back as the id it was indexed with, so an older id must still name
+ * the screen it points at now.
+ */
+const MOVED_HREF_PREFIXES: readonly (readonly [string, string])[] = [
+  ['/(app)/(tabs)/(3_profile)/security-agent/', FINDING_HREF_PREFIX],
+];
+
+/** An indexed id at the route the app shows today. */
+export function canonicalSystemSearchId(id: string): string {
+  for (const [from, to] of MOVED_HREF_PREFIXES) {
+    if (id.startsWith(from)) {
+      return `${to}${id.slice(from.length)}`;
+    }
+  }
+  return id;
+}
+
 /** The app-scheme prefix every deeplink carries. */
 export const APP_SCHEME = 'kiloapp://';
 
diff --git a/apps/mobile/src/lib/system-search-route.test.ts b/apps/mobile/src/lib/system-search-route.test.ts
index 6d63423ec78..09360707399 100644
--- a/apps/mobile/src/lib/system-search-route.test.ts
+++ b/apps/mobile/src/lib/system-search-route.test.ts
@@ -306,6 +306,12 @@ describe('system-search-route', () => {
       }
     });
 
+    it('resolves an id indexed before the finding route moved', () => {
+      expect(
+        systemSearchHrefFromRoute('/(app)/(tabs)/(3_profile)/security-agent/org-1/findings/f-1')
+      ).toBe('/(app)/security-agent/org-1/findings/f-1');
+    });
+
     it('resolves the link Android stores to the exact screen', () => {
       for (const id of ids) {
         const link = systemSearchDeeplinkFromId(id);

From da133caa683649a13de9bd7a05b2d1ff9ed3b229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20=C5=A0=C4=87eki=C4=87?=
 <4062236+iscekic@users.noreply.github.com>
Date: Thu, 22 Oct 2026 15:14:44 +0000
Subject: [PATCH 3/7] fix(mobile): point invalid Code Reviewer routes at the
 Code Reviewer entry

A Code Reviewer route that cannot render, because its scope or review id is
missing, now sends the user to the Code Reviewer entry instead of the Profile
tab. The routes live in the root stack, so the entry is the screen that opened
them and no tab bar is selected underneath.
---
 .../(app)/code-reviewer/[scope]/index.mounted.test.tsx    | 8 ++++----
 apps/mobile/src/app/(app)/code-reviewer/[scope]/index.tsx | 2 +-
 .../code-reviewer/[scope]/manual-review.mounted.test.tsx  | 8 ++++----
 .../src/app/(app)/code-reviewer/[scope]/manual-review.tsx | 2 +-
 .../code-reviewer/[scope]/reviews/[id].mounted.test.tsx   | 8 ++++----
 .../src/app/(app)/code-reviewer/[scope]/reviews/[id].tsx  | 2 +-
 .../code-reviewer/[scope]/reviews/index.mounted.test.tsx  | 8 ++++----
 .../src/app/(app)/code-reviewer/[scope]/reviews/index.tsx | 2 +-
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/apps/mobile/src/app/(app)/code-reviewer/[scope]/index.mounted.test.tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/index.mounted.test.tsx
index ebb461197ec..efc078bfbba 100644
--- a/apps/mobile/src/app/(app)/code-reviewer/[scope]/index.mounted.test.tsx
+++ b/apps/mobile/src/app/(app)/code-reviewer/[scope]/index.mounted.test.tsx
@@ -50,13 +50,13 @@ beforeEach(() => {
 });
 
 describe('CodeReviewerScopeRoute invalid scope', () => {
-  it('renders InvalidRouteState with the profile backTo when scope is undefined', () => {
+  it('renders InvalidRouteState with the Code Reviewer backTo when scope is undefined', () => {
     useLocalSearchParamsMock.mockReturnValue({ scope: undefined });
     const renderer = mountRoute();
 
     const invalid = findByType(renderer.root, 'InvalidRouteState');
     expect(invalid).toHaveLength(1);
-    expect(propOf(invalid[0], 'backTo')).toBe('/(app)/(tabs)/(3_profile)');
+    expect(propOf(invalid[0], 'backTo')).toBe('/(app)/code-reviewer');
     expect(findByType(renderer.root, 'PlatformListScreen')).toHaveLength(0);
 
     act(() => {
@@ -64,13 +64,13 @@ describe('CodeReviewerScopeRoute invalid scope', () => {
     });
   });
 
-  it('renders InvalidRouteState with the profile backTo when scope is an array', () => {
+  it('renders InvalidRouteState with the Code Reviewer backTo when scope is an array', () => {
     useLocalSearchParamsMock.mockReturnValue({ scope: ['personal', 'org'] });
     const renderer = mountRoute();
 
     const invalid = findByType(renderer.root, 'InvalidRouteState');
     expect(invalid).toHaveLength(1);
-    expect(propOf(invalid[0], 'backTo')).toBe('/(app)/(tabs)/(3_profile)');
+    expect(propOf(invalid[0], 'backTo')).toBe('/(app)/code-reviewer');
     expect(findByType(renderer.root, 'PlatformListScreen')).toHaveLength(0);
 
     act(() => {
diff --git a/apps/mobile/src/app/(app)/code-reviewer/[scope]/index.tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/index.tsx
index 7d5feaf312e..0584c7e7365 100644
--- a/apps/mobile/src/app/(app)/code-reviewer/[scope]/index.tsx
+++ b/apps/mobile/src/app/(app)/code-reviewer/[scope]/index.tsx
@@ -9,7 +9,7 @@ export default function CodeReviewerScopeRoute() {
   const scope = parseParam(rawScope);
 
   if (!scope) {
-    return <InvalidRouteState backTo={'/(app)/(tabs)/(3_profile)' as Href} />;
+    return <InvalidRouteState backTo={'/(app)/code-reviewer' as Href} />;
   }
 
   return <PlatformListScreen scope={scope} />;
diff --git a/apps/mobile/src/app/(app)/code-reviewer/[scope]/manual-review.mounted.test.tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/manual-review.mounted.test.tsx
index ea0d669103b..fa14e241056 100644
--- a/apps/mobile/src/app/(app)/code-reviewer/[scope]/manual-review.mounted.test.tsx
+++ b/apps/mobile/src/app/(app)/code-reviewer/[scope]/manual-review.mounted.test.tsx
@@ -50,13 +50,13 @@ beforeEach(() => {
 });
 
 describe('CodeReviewerManualReviewRoute invalid scope', () => {
-  it('renders InvalidRouteState with the profile backTo when scope is undefined', () => {
+  it('renders InvalidRouteState with the Code Reviewer backTo when scope is undefined', () => {
     useLocalSearchParamsMock.mockReturnValue({ scope: undefined });
     const renderer = mountRoute();
 
     const invalid = findByType(renderer.root, 'InvalidRouteState');
     expect(invalid).toHaveLength(1);
-    expect(propOf(invalid[0], 'backTo')).toBe('/(app)/(tabs)/(3_profile)');
+    expect(propOf(invalid[0], 'backTo')).toBe('/(app)/code-reviewer');
     expect(findByType(renderer.root, 'ManualReviewScreen')).toHaveLength(0);
 
     act(() => {
@@ -64,13 +64,13 @@ describe('CodeReviewerManualReviewRoute invalid scope', () => {
     });
   });
 
-  it('renders InvalidRouteState with the profile backTo when scope is an array', () => {
+  it('renders InvalidRouteState with the Code Reviewer backTo when scope is an array', () => {
     useLocalSearchParamsMock.mockReturnValue({ scope: ['personal', 'org'] });
     const renderer = mountRoute();
 
     const invalid = findByType(renderer.root, 'InvalidRouteState');
     expect(invalid).toHaveLength(1);
-    expect(propOf(invalid[0], 'backTo')).toBe('/(app)/(tabs)/(3_profile)');
+    expect(propOf(invalid[0], 'backTo')).toBe('/(app)/code-reviewer');
     expect(findByType(renderer.root, 'ManualReviewScreen')).toHaveLength(0);
 
     act(() => {
diff --git a/apps/mobile/src/app/(app)/code-reviewer/[scope]/manual-review.tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/manual-review.tsx
index 17786d4d302..95a78734be1 100644
--- a/apps/mobile/src/app/(app)/code-reviewer/[scope]/manual-review.tsx
+++ b/apps/mobile/src/app/(app)/code-reviewer/[scope]/manual-review.tsx
@@ -9,7 +9,7 @@ export default function CodeReviewerManualReviewRoute() {
   const scope = parseParam(rawScope);
 
   if (!scope) {
-    return <InvalidRouteState backTo={'/(app)/(tabs)/(3_profile)' as Href} />;
+    return <InvalidRouteState backTo={'/(app)/code-reviewer' as Href} />;
   }
 
   return <ManualReviewScreen scope={scope} />;
diff --git a/apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/[id].mounted.test.tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/[id].mounted.test.tsx
index eac9ee559a4..34fbe70a258 100644
--- a/apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/[id].mounted.test.tsx
+++ b/apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/[id].mounted.test.tsx
@@ -50,13 +50,13 @@ beforeEach(() => {
 });
 
 describe('CodeReviewerReviewDetailRoute invalid scope', () => {
-  it('renders InvalidRouteState with the profile backTo when scope is undefined', () => {
+  it('renders InvalidRouteState with the Code Reviewer backTo when scope is undefined', () => {
     useLocalSearchParamsMock.mockReturnValue({ scope: undefined, id: 'rev-1' });
     const renderer = mountRoute();
 
     const invalid = findByType(renderer.root, 'InvalidRouteState');
     expect(invalid).toHaveLength(1);
-    expect(propOf(invalid[0], 'backTo')).toBe('/(app)/(tabs)/(3_profile)');
+    expect(propOf(invalid[0], 'backTo')).toBe('/(app)/code-reviewer');
     expect(findByType(renderer.root, 'ReviewDetailScreen')).toHaveLength(0);
 
     act(() => {
@@ -64,13 +64,13 @@ describe('CodeReviewerReviewDetailRoute invalid scope', () => {
     });
   });
 
-  it('renders InvalidRouteState with the profile backTo when scope is an array', () => {
+  it('renders InvalidRouteState with the Code Reviewer backTo when scope is an array', () => {
     useLocalSearchParamsMock.mockReturnValue({ scope: ['personal', 'org'], id: 'rev-1' });
     const renderer = mountRoute();
 
     const invalid = findByType(renderer.root, 'InvalidRouteState');
     expect(invalid).toHaveLength(1);
-    expect(propOf(invalid[0], 'backTo')).toBe('/(app)/(tabs)/(3_profile)');
+    expect(propOf(invalid[0], 'backTo')).toBe('/(app)/code-reviewer');
     expect(findByType(renderer.root, 'ReviewDetailScreen')).toHaveLength(0);
 
     act(() => {
diff --git a/apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/[id].tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/[id].tsx
index 022684c9f6f..a459115c49b 100644
--- a/apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/[id].tsx
+++ b/apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/[id].tsx
@@ -11,7 +11,7 @@ export default function CodeReviewerReviewDetailRoute() {
 
   if (!scope || !reviewId) {
     const backTo = (
-      scope ? `/(app)/code-reviewer/${scope}/reviews` : '/(app)/(tabs)/(3_profile)'
+      scope ? `/(app)/code-reviewer/${scope}/reviews` : '/(app)/code-reviewer'
     ) as Href;
     return <InvalidRouteState backTo={backTo} />;
   }
diff --git a/apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/index.mounted.test.tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/index.mounted.test.tsx
index 67a7f34abdd..20b86da9fd6 100644
--- a/apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/index.mounted.test.tsx
+++ b/apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/index.mounted.test.tsx
@@ -50,13 +50,13 @@ beforeEach(() => {
 });
 
 describe('CodeReviewerReviewListRoute invalid scope', () => {
-  it('renders InvalidRouteState with the profile backTo when scope is undefined', () => {
+  it('renders InvalidRouteState with the Code Reviewer backTo when scope is undefined', () => {
     useLocalSearchParamsMock.mockReturnValue({ scope: undefined });
     const renderer = mountRoute();
 
     const invalid = findByType(renderer.root, 'InvalidRouteState');
     expect(invalid).toHaveLength(1);
-    expect(propOf(invalid[0], 'backTo')).toBe('/(app)/(tabs)/(3_profile)');
+    expect(propOf(invalid[0], 'backTo')).toBe('/(app)/code-reviewer');
     expect(findByType(renderer.root, 'ReviewListScreen')).toHaveLength(0);
 
     act(() => {
@@ -64,13 +64,13 @@ describe('CodeReviewerReviewListRoute invalid scope', () => {
     });
   });
 
-  it('renders InvalidRouteState with the profile backTo when scope is an array', () => {
+  it('renders InvalidRouteState with the Code Reviewer backTo when scope is an array', () => {
     useLocalSearchParamsMock.mockReturnValue({ scope: ['personal', 'org'] });
     const renderer = mountRoute();
 
     const invalid = findByType(renderer.root, 'InvalidRouteState');
     expect(invalid).toHaveLength(1);
-    expect(propOf(invalid[0], 'backTo')).toBe('/(app)/(tabs)/(3_profile)');
+    expect(propOf(invalid[0], 'backTo')).toBe('/(app)/code-reviewer');
     expect(findByType(renderer.root, 'ReviewListScreen')).toHaveLength(0);
 
     act(() => {
diff --git a/apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/index.tsx b/apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/index.tsx
index 75e3ac3eb2b..89bb3905779 100644
--- a/apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/index.tsx
+++ b/apps/mobile/src/app/(app)/code-reviewer/[scope]/reviews/index.tsx
@@ -9,7 +9,7 @@ export default function CodeReviewerReviewListRoute() {
   const scope = parseParam(rawScope);
 
   if (!scope) {
-    return <InvalidRouteState backTo={'/(app)/(tabs)/(3_profile)' as Href} />;
+    return <InvalidRouteState backTo={'/(app)/code-reviewer' as Href} />;
   }
 
   return <ReviewListScreen scope={scope} />;

From 89fa69c7582c2ae934aa8de6adbfb24a7c7a437e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20=C5=A0=C4=87eki=C4=87?=
 <4062236+iscekic@users.noreply.github.com>
Date: Thu, 22 Oct 2026 17:13:13 +0000
Subject: [PATCH 4/7] fix(mobile): keep finding back navigation in Security
 Agent

A finding opened without local history now returns to its scope's findings
list in the root stack. This keeps the return path within the relocated
Security Agent surface rather than switching to a tab.
---
 .../finding-detail-screen.mounted.test.tsx    |  2 +-
 .../security-agent/finding-detail-screen.tsx  | 13 +++++++----
 apps/mobile/src/lib/finding-detail-back.ts    | 23 +++++++++----------
 .../mobile/src/lib/profile-tab-anchor.test.ts | 19 +++++----------
 4 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/apps/mobile/src/components/security-agent/finding-detail-screen.mounted.test.tsx b/apps/mobile/src/components/security-agent/finding-detail-screen.mounted.test.tsx
index 40d4bfe7d31..e1e31d2098e 100644
--- a/apps/mobile/src/components/security-agent/finding-detail-screen.mounted.test.tsx
+++ b/apps/mobile/src/components/security-agent/finding-detail-screen.mounted.test.tsx
@@ -281,7 +281,7 @@ describe.each([true, false])('finding load states with local history=%s', hasLoc
   function expectSafeBack(tree: R) {
     press(tree, 'common.goBack');
     expect(navigation.history).toEqual(
-      hasLocalHistory ? [scopeRoot] : ['/(app)/(tabs)/(3_profile)']
+      hasLocalHistory ? [scopeRoot] : ['/(app)/security-agent/personal/findings']
     );
   }
 
diff --git a/apps/mobile/src/components/security-agent/finding-detail-screen.tsx b/apps/mobile/src/components/security-agent/finding-detail-screen.tsx
index f873362954c..2474207ecd0 100644
--- a/apps/mobile/src/components/security-agent/finding-detail-screen.tsx
+++ b/apps/mobile/src/components/security-agent/finding-detail-screen.tsx
@@ -91,12 +91,15 @@ export function FindingDetailScreen({ scope, findingId }: Readonly<FindingDetail
 
   // The back control always renders. With local history it pops normally
   // (findings-list -> finding returns to the list). A push/deep-link open has
-  // no local history, so `router.back()` is a no-op and back replaces the
-  // whole profile-tab subtree with its root instead. The signal is the nested
-  // Stack's own state index, not `router.canGoBack()` (which is recursive and
-  // also reports parent history).
+  // no local history, so `router.back()` is a no-op and back replaces itself
+  // with the scope's findings list, a sibling route in the root stack. The
+  // signal is the nested Stack's own state index, not `router.canGoBack()`
+  // (which is recursive and also reports parent history).
   const handleBack = () => {
-    const target = findingDetailBackTarget(findingDetailHasLocalHistory(navigation.getState()));
+    const target = findingDetailBackTarget(
+      findingDetailHasLocalHistory(navigation.getState()),
+      scope
+    );
     if (target.kind === 'pop') {
       router.back();
     } else {
diff --git a/apps/mobile/src/lib/finding-detail-back.ts b/apps/mobile/src/lib/finding-detail-back.ts
index 762e8d27413..36b26dffc27 100644
--- a/apps/mobile/src/lib/finding-detail-back.ts
+++ b/apps/mobile/src/lib/finding-detail-back.ts
@@ -1,12 +1,6 @@
 import { type Href } from 'expo-router';
 
-/**
- * Profile tab root. This is the fixed landing target when a push/deep-link
- * opened a finding report with no in-app history beneath it. The group href
- * (no trailing `/index`) is the route expo-router matches — the `/index`
- * suffix resolves to the not-found screen.
- */
-export const PROFILE_TAB_ROOT = '/(app)/(tabs)/(3_profile)' as Href;
+import { getSecurityAgentPath } from '@/lib/security-agent';
 
 export type FindingDetailBackTarget = { kind: 'pop' } | { kind: 'replace'; href: Href };
 
@@ -29,14 +23,19 @@ export function findingDetailHasLocalHistory(state: { index: number } | undefine
  *
  * - `pop` when there is local history: the normal findings-list -> finding
  *   flow must return to the list, so back pops normally.
- * - `replace` to the profile root when there is no local history: a
+ * - `replace` to the scope's findings list when there is no local history: a
  *   push/deep-link opened the report with nothing beneath it, so a bare `pop`
- *   is a no-op and back must land on the profile root — never an intermediate
- *   security-agent screen.
+ *   is a no-op and back must land on that list. It is a sibling route in the
+ *   same stack as the report — `security-agent` lives in the root stack, above
+ *   the tab bar — so the landing leaves no tab selected and never drops the
+ *   user into a different tab.
  */
-export function findingDetailBackTarget(hasLocalHistory: boolean): FindingDetailBackTarget {
+export function findingDetailBackTarget(
+  hasLocalHistory: boolean,
+  scope: string
+): FindingDetailBackTarget {
   if (hasLocalHistory) {
     return { kind: 'pop' };
   }
-  return { kind: 'replace', href: PROFILE_TAB_ROOT };
+  return { kind: 'replace', href: getSecurityAgentPath(scope, 'findings') };
 }
diff --git a/apps/mobile/src/lib/profile-tab-anchor.test.ts b/apps/mobile/src/lib/profile-tab-anchor.test.ts
index a732d34ca3d..72a9512453f 100644
--- a/apps/mobile/src/lib/profile-tab-anchor.test.ts
+++ b/apps/mobile/src/lib/profile-tab-anchor.test.ts
@@ -5,11 +5,8 @@ import { fileURLToPath } from 'node:url';
 
 import { afterEach, describe, expect, it, vi } from 'vitest';
 
-import {
-  findingDetailBackTarget,
-  findingDetailHasLocalHistory,
-  PROFILE_TAB_ROOT,
-} from './finding-detail-back';
+import { findingDetailBackTarget, findingDetailHasLocalHistory } from './finding-detail-back';
+import { getSecurityAgentPath } from './security-agent';
 import { profileTabPressListeners } from './tab-press-listeners';
 import { __resetTabSwitchInputForTests } from './tab-switch-input-gate';
 
@@ -39,19 +36,15 @@ describe('findingDetailHasLocalHistory', () => {
 
 describe('findingDetailBackTarget', () => {
   it('pops when there is local history (findings-list -> finding)', () => {
-    expect(findingDetailBackTarget(true)).toEqual({ kind: 'pop' });
+    expect(findingDetailBackTarget(true, 'personal')).toEqual({ kind: 'pop' });
   });
 
-  it('replaces to the profile root when a push/deep-link opened the report with no local history', () => {
-    expect(findingDetailBackTarget(false)).toEqual({
+  it('replaces with the scope findings list when a push/deep-link has no local history', () => {
+    expect(findingDetailBackTarget(false, 'personal')).toEqual({
       kind: 'replace',
-      href: '/(app)/(tabs)/(3_profile)',
+      href: getSecurityAgentPath('personal', 'findings'),
     });
   });
-
-  it('anchors the no-history landing target to the profile tab root', () => {
-    expect(PROFILE_TAB_ROOT).toBe('/(app)/(tabs)/(3_profile)');
-  });
 });
 
 describe('finding detail back control wiring', () => {

From a247c3cae7a04d1004e8372d076aee9227aa75ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20=C5=A0=C4=87eki=C4=87?=
 <4062236+iscekic@users.noreply.github.com>
Date: Thu, 22 Oct 2026 17:40:25 +0000
Subject: [PATCH 5/7] test(mobile): pin Security Agent scope stack routes

---
 .../src/lib/security-notification-navigation.mounted.test.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/mobile/src/lib/security-notification-navigation.mounted.test.tsx b/apps/mobile/src/lib/security-notification-navigation.mounted.test.tsx
index 6f9387c6fcf..c99aa9e2d85 100644
--- a/apps/mobile/src/lib/security-notification-navigation.mounted.test.tsx
+++ b/apps/mobile/src/lib/security-notification-navigation.mounted.test.tsx
@@ -93,7 +93,7 @@ describe.each(['personal', 'org-example'])('security notification routes (%s)',
 
     mountScope(scope);
     expect(unstable_settings.anchor).toBe('index');
-    expect(declaredScopeRoutes()).toContain('index');
+    expect(declaredScopeRoutes()).toEqual(['index', 'dismiss/[id]', 'filter']);
 
     const url = new URL(path, 'https://example.test');
     expect(url.pathname.split('/').filter(Boolean)).toEqual([

From d57753c6473e1ee4fca84259b403b054c2246f82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20=C5=A0=C4=87eki=C4=87?=
 <4062236+iscekic@users.noreply.github.com>
Date: Thu, 22 Oct 2026 20:24:43 +0000
Subject: [PATCH 6/7] fix(mobile): restore pending links at relocated routes

---
 apps/mobile/src/lib/current-route-href.ts    | 13 ++++++
 apps/mobile/src/lib/deep-link-launch.test.ts | 42 ++++++++++++++++++++
 apps/mobile/src/lib/deep-link-launch.ts      |  3 +-
 apps/mobile/src/lib/last-route.ts            | 21 +---------
 4 files changed, 58 insertions(+), 21 deletions(-)
 create mode 100644 apps/mobile/src/lib/current-route-href.ts

diff --git a/apps/mobile/src/lib/current-route-href.ts b/apps/mobile/src/lib/current-route-href.ts
new file mode 100644
index 00000000000..89ecd5b1af4
--- /dev/null
+++ b/apps/mobile/src/lib/current-route-href.ts
@@ -0,0 +1,13 @@
+const MOVED_ROUTE_PREFIXES: readonly (readonly [string, string])[] = [
+  ['/(app)/(tabs)/(3_profile)/code-reviewer', '/(app)/code-reviewer'],
+  ['/(app)/(tabs)/(3_profile)/security-agent', '/(app)/security-agent'],
+];
+
+export function currentRouteHref(href: string): string {
+  for (const [from, to] of MOVED_ROUTE_PREFIXES) {
+    if (href === from || href.startsWith(`${from}/`) || href.startsWith(`${from}?`)) {
+      return `${to}${href.slice(from.length)}`;
+    }
+  }
+  return href;
+}
diff --git a/apps/mobile/src/lib/deep-link-launch.test.ts b/apps/mobile/src/lib/deep-link-launch.test.ts
index 4d31845c358..101b638cfad 100644
--- a/apps/mobile/src/lib/deep-link-launch.test.ts
+++ b/apps/mobile/src/lib/deep-link-launch.test.ts
@@ -483,6 +483,48 @@ describe('deep-link-launch', () => {
       expect(getPendingDeepLink()).toBe('/(app)/(tabs)/(3_profile)');
     });
 
+    it.each([
+      [
+        '/(app)/(tabs)/(3_profile)/security-agent/personal/findings/finding-1?source=push',
+        '/(app)/security-agent/personal/findings/finding-1?source=push',
+      ],
+      ['/(app)/(tabs)/(3_profile)/security-agent', '/(app)/security-agent'],
+      [
+        '/(app)/(tabs)/(3_profile)/code-reviewer/personal/github',
+        '/(app)/code-reviewer/personal/github',
+      ],
+      [
+        '/(app)/(tabs)/(3_profile)/code-reviewer?scope=personal',
+        '/(app)/code-reviewer?scope=personal',
+      ],
+      ['/(app)/security-agent/personal', '/(app)/security-agent/personal'],
+      ['/(app)/(tabs)/(3_profile)/profiles/p1', '/(app)/(tabs)/(3_profile)/profiles/p1'],
+      [
+        '/(app)/(tabs)/(3_profile)/code-reviewer-extra',
+        '/(app)/(tabs)/(3_profile)/code-reviewer-extra',
+      ],
+    ])('restores the current destination for persisted href %s', async (href, expected) => {
+      store.set(
+        PENDING_DEEP_LINK_KEY,
+        JSON.stringify({
+          href,
+          source: 'notification',
+          storedAt: Date.now(),
+          userId: 'user-a',
+          organizationId: 'org-1',
+        })
+      );
+      setCurrentDeepLinkUserId('user-a');
+
+      await restorePersistedPendingDeepLink();
+
+      expect(consumePendingDeepLink()).toEqual({
+        href: expected,
+        organizationId: 'org-1',
+      });
+      expect(consumePendingDeepLink()).toBeNull();
+    });
+
     it('discards a record captured for a different user', async () => {
       store.set(
         PENDING_DEEP_LINK_KEY,
diff --git a/apps/mobile/src/lib/deep-link-launch.ts b/apps/mobile/src/lib/deep-link-launch.ts
index e6156ca3a2e..828dcade2d8 100644
--- a/apps/mobile/src/lib/deep-link-launch.ts
+++ b/apps/mobile/src/lib/deep-link-launch.ts
@@ -7,6 +7,7 @@ import {
   SESSION_RESUME_ANCHOR_PARAM,
 } from '@kilocode/app-shared/universal-links';
 
+import { currentRouteHref } from './current-route-href';
 import { PENDING_DEEP_LINK_KEY } from './storage-keys';
 import { APP_SCHEME, isSystemSearchFamilyLink } from './system-search-families';
 
@@ -454,7 +455,7 @@ function parsePendingDeepLinkRecord(raw: string): PendingDeepLinkRecord | null {
   try {
     const parsed: unknown = JSON.parse(raw);
     const result = pendingDeepLinkRecordSchema.safeParse(parsed);
-    return result.success ? result.data : null;
+    return result.success ? { ...result.data, href: currentRouteHref(result.data.href) } : null;
   } catch {
     return null;
   }
diff --git a/apps/mobile/src/lib/last-route.ts b/apps/mobile/src/lib/last-route.ts
index 3d9367d6504..bd7a62e0a88 100644
--- a/apps/mobile/src/lib/last-route.ts
+++ b/apps/mobile/src/lib/last-route.ts
@@ -1,5 +1,6 @@
 import { z } from 'zod';
 
+import { currentRouteHref } from '@/lib/current-route-href';
 import { LAST_ROUTE_KEY } from '@/lib/storage-keys';
 import { isConcreteLastRouteHref } from '@/lib/last-route-recordable';
 import { reportSecureStoreFailure } from '@/lib/telemetry/secure-store-events';
@@ -74,26 +75,6 @@ function notify(): void {
   }
 }
 
-/**
- * Routes that moved out of a tab stack into the root stack. A record mirrored
- * by an older build still names the old stack; replaying it would open an
- * unmatched route after the update, so the parse maps it to where the screen
- * lives now.
- */
-const MOVED_ROUTE_PREFIXES: readonly (readonly [string, string])[] = [
-  ['/(app)/(tabs)/(3_profile)/code-reviewer', '/(app)/code-reviewer'],
-  ['/(app)/(tabs)/(3_profile)/security-agent', '/(app)/security-agent'],
-];
-
-function currentRouteHref(href: string): string {
-  for (const [from, to] of MOVED_ROUTE_PREFIXES) {
-    if (href === from || href.startsWith(`${from}/`) || href.startsWith(`${from}?`)) {
-      return `${to}${href.slice(from.length)}`;
-    }
-  }
-  return href;
-}
-
 /** Parse a stored record; a corrupt, unreadable, or placeholder-bearing mirror reads as absent. */
 function parseStoredRecord(raw: string): LastRouteRecord | null {
   try {

From 8b3bec5a6285b2d243dff2a38991b1f16d8c56f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20=C5=A0=C4=87eki=C4=87?=
 <4062236+iscekic@users.noreply.github.com>
Date: Thu, 22 Oct 2026 20:30:52 +0000
Subject: [PATCH 7/7] docs(mobile): retain persisted route migration rationale

---
 apps/mobile/src/lib/current-route-href.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/mobile/src/lib/current-route-href.ts b/apps/mobile/src/lib/current-route-href.ts
index 89ecd5b1af4..fbd4c5cdbe2 100644
--- a/apps/mobile/src/lib/current-route-href.ts
+++ b/apps/mobile/src/lib/current-route-href.ts
@@ -1,3 +1,4 @@
+// Persisted navigation survives app upgrades; these retired route groups must still resolve.
 const MOVED_ROUTE_PREFIXES: readonly (readonly [string, string])[] = [
   ['/(app)/(tabs)/(3_profile)/code-reviewer', '/(app)/code-reviewer'],
   ['/(app)/(tabs)/(3_profile)/security-agent', '/(app)/security-agent'],