update

frontend/src/components/layout/AppShell.jsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { Link, useLocation } from 'react-router-dom';
 import {
     Zap,
@@ -8,14 +8,12 @@ import {
     Handshake,
     ChevronLeft,
     ChevronRight,
-    Settings,
 } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { cn } from '@/lib/utils';
-import { apiFetch } from '@/lib/api';
 import GoogleAuthBar from '@/components/layout/GoogleAuthBar';
 
-const BASE_NAV_ITEMS = [
+const NAV_ITEMS = [
     { label: 'Generator', href: '/', icon: LayoutDashboard },
     { label: 'Contacts', href: '/contacts', icon: Users },
     { label: 'Leads', href: '/leads', icon: Inbox },
@@ -31,30 +29,6 @@ function pathMatches(locationPath, href) {
 
 export default function AppShell({ title, subtitle, rightContent, children }) {
     const location = useLocation();
-    const [showSettingsNav, setShowSettingsNav] = useState(false);
-
-    useEffect(() => {
-        const syncSettingsNav = () => {
-            apiFetch('/api/auth/me')
-                .then((r) => (r.ok ? r.json() : null))
-                .then((u) => setShowSettingsNav(u != null))
-                .catch(() => setShowSettingsNav(false));
-        };
-        syncSettingsNav();
-        window.addEventListener('emailout-auth-changed', syncSettingsNav);
-        return () => window.removeEventListener('emailout-auth-changed', syncSettingsNav);
-    }, []);
-
-    const navItems = useMemo(
-        () =>
-            showSettingsNav
-                ? [
-                      ...BASE_NAV_ITEMS,
-                      { label: 'Settings', href: '/settings', icon: Settings },
-                  ]
-                : BASE_NAV_ITEMS,
-        [showSettingsNav]
-    );
 
     const [sidebarCollapsed, setSidebarCollapsed] = useState(() => {
         try {
@@ -116,7 +90,7 @@ export default function AppShell({ title, subtitle, rightContent, children }) {
                     </div>
                 </div>
                 <nav className="flex items-center gap-2 border-t border-slate-100 bg-white/90 px-4 py-2 md:hidden flex-wrap">
-                    {navItems.map((item) => {
+                    {NAV_ITEMS.map((item) => {
                         const active = pathMatches(location.pathname, item.href);
                         return (
                             <Button
@@ -146,7 +120,7 @@ export default function AppShell({ title, subtitle, rightContent, children }) {
                             sidebarCollapsed && 'items-center'
                         )}
                     >
-                        {navItems.map((item) => {
+                        {NAV_ITEMS.map((item) => {
                             const Icon = item.icon;
                             const active = pathMatches(location.pathname, item.href);
                             return (

frontend/src/components/layout/GoogleAuthBar.jsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react';
-import { useSearchParams } from 'react-router-dom';
-import { LogOut } from 'lucide-react';
+import { Link, useLocation, useSearchParams } from 'react-router-dom';
+import { LogOut, Settings } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { cn } from '@/lib/utils';
 import { apiFetch } from '@/lib/api';
@@ -9,6 +9,7 @@ import { apiFetch } from '@/lib/api';
  * Sign-in (Google). Workspace details and switching context live in Settings / session. OAuth callback sets session.
  */
 export default function GoogleAuthBar() {
+    const location = useLocation();
     const [searchParams, setSearchParams] = useSearchParams();
     const [phase, setPhase] = useState('loading');
     const [googleOn, setGoogleOn] = useState(false);
@@ -85,8 +86,26 @@ export default function GoogleAuthBar() {
     }
 
     if (user) {
+        const settingsActive =
+            location.pathname === '/settings' || location.pathname.startsWith('/settings/');
         return (
             <div className="flex max-w-[min(100vw-6rem,28rem)] flex-wrap items-center justify-end gap-2">
+                <Button
+                    asChild
+                    variant="ghost"
+                    size="icon"
+                    className={cn(
+                        'h-9 w-9 shrink-0 text-slate-600 hover:text-violet-700 hover:bg-violet-50',
+                        settingsActive && 'text-violet-700 bg-violet-50'
+                    )}
+                    title="Settings"
+                    aria-current={settingsActive ? 'page' : undefined}
+                >
+                    <Link to="/settings">
+                        <Settings className="h-5 w-5" aria-hidden />
+                        <span className="sr-only">Settings</span>
+                    </Link>
+                </Button>
                 {user.picture ? (
                     <img
                         src={user.picture}