-
+
{activeProviderAccount && !accountsOverlayOpen && (
}>{content}
)}
+ {/* Desktop Settings modal — mounted over whatever page is rendered
+ beneath when the URL is a settings path. */}
+ {settingsOpen && !chromeless &&
}
{/* Hidden Remotion-driven producer for the Meet camera. Mounts a
640×480 JPEG frame stream to the Rust frame bus while a meet
diff --git a/app/src/AppRoutes.tsx b/app/src/AppRoutes.tsx
index 49648e851..db11a97c8 100644
--- a/app/src/AppRoutes.tsx
+++ b/app/src/AppRoutes.tsx
@@ -1,4 +1,4 @@
-import { Navigate, Route, Routes } from 'react-router-dom';
+import { type Location, Navigate, Route, Routes } from 'react-router-dom';
import AgentWorldShell from './agentworld/AgentWorldShell';
import AgentWorld from './agentworld/pages/AgentWorld';
@@ -17,14 +17,23 @@ import Notifications from './pages/Notifications';
import Onboarding from './pages/onboarding/Onboarding';
import { PttOverlayPage } from './pages/PttOverlayPage';
import Rewards from './pages/Rewards';
-import Settings from './pages/Settings';
import Skills from './pages/Skills';
import WebCallbackPage from './pages/WebCallbackPage';
import Welcome from './pages/Welcome';
import WorkflowNew from './pages/WorkflowNew';
import WorkflowsRun from './pages/WorkflowsRun';
-const AppRoutes = () => {
+interface AppRoutesProps {
+ /**
+ * Optional location override. The desktop shell passes the *background*
+ * location here while the Settings modal is open, so the page behind the
+ * modal stays rendered even though the URL is `/settings/*`. Omitted
+ * everywhere else (router uses the ambient location).
+ */
+ location?: Location | string;
+}
+
+const AppRoutes = ({ location }: AppRoutesProps = {}) => {
// Mobile target (iOS or Android): pair → Human/Chat/Settings only.
// Desktop routes are not rendered.
if (getIsMobile()) {
@@ -32,7 +41,7 @@ const AppRoutes = () => {
}
return (
-
+
{/* Public routes - redirect to /home if logged in */}
{
} />
-
-
-
- }
- />
+ {/* Desktop Settings renders as a modal overlay mounted by AppShellDesktop
+ (App.tsx) using the backgroundLocation pattern — it is no longer an
+ inline route here. iOS keeps its own /settings/* route in
+ AppRoutesIOS.tsx. */}
} />
diff --git a/app/src/components/intelligence/IntelligenceSubconsciousTab.tsx b/app/src/components/intelligence/IntelligenceSubconsciousTab.tsx
index f3404f553..1248408a7 100644
--- a/app/src/components/intelligence/IntelligenceSubconsciousTab.tsx
+++ b/app/src/components/intelligence/IntelligenceSubconsciousTab.tsx
@@ -1,9 +1,10 @@
import { useCallback, useEffect, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
import { useT } from '../../lib/i18n/I18nContext';
import type { SubconsciousMode } from '../../utils/tauriCommands/heartbeat';
import type { SubconsciousStatus } from '../../utils/tauriCommands/subconscious';
+import { settingsNavState } from '../settings/modal/settingsOverlay';
interface ModeOption {
id: SubconsciousMode;
@@ -67,6 +68,7 @@ export default function IntelligenceSubconsciousTab({
}: IntelligenceSubconsciousTabProps) {
const { t } = useT();
const navigate = useNavigate();
+ const location = useLocation();
const providerUnavailable = status?.provider_available === false;
const providerUnavailableReason = providerUnavailable
? (status?.provider_unavailable_reason ?? t('subconscious.providerUnavailableTitle'))
@@ -238,7 +240,7 @@ export default function IntelligenceSubconsciousTab({