refactor: rename tabs, flatten composer, polish UI

app/src/App.tsx

@@ -1,7 +1,12 @@
 import * as Sentry from '@sentry/react';
-import { useEffect } from 'react';
+import { useEffect, useRef } from 'react';
 import { Provider } from 'react-redux';
-import { HashRouter as Router, useLocation, useNavigate } from 'react-router-dom';
+import {
+  HashRouter as Router,
+  useLocation,
+  useNavigate,
+  useNavigationType,
+} from 'react-router-dom';
 import { PersistGate } from 'redux-persist/integration/react';
 
 import AppRoutes from './AppRoutes';
@@ -200,11 +205,22 @@ function AppShellDesktop() {
   // the core is ready (once per boot). Extracted to a hook so it's testable.
   useNotchBootSync(isBootstrapping);
 
+  const scrollRef = useRef<HTMLDivElement>(null);
+  const navType = useNavigationType();
+
+  useEffect(() => {
+    if (navType !== 'POP') {
+      scrollRef.current?.scrollTo(0, 0);
+    }
+  }, [location.pathname, navType]);
+
   return (
     <div className="relative h-screen flex flex-col overflow-hidden">
       <AppBackground />
       <div className="relative z-10 flex-1 flex flex-col overflow-hidden">
-        <div className={`flex-1 overflow-y-auto ${fullscreen || onOnboardingRoute ? '' : 'pb-16'}`}>
+        <div
+          ref={scrollRef}
+          className={`flex-1 overflow-y-auto ${fullscreen || onOnboardingRoute ? '' : 'pb-16'}`}>
           <GlobalUpsellBanner />
           <AppRoutes />
         </div>

app/src/AppRoutes.tsx

@@ -7,7 +7,6 @@ import PublicRoute from './components/PublicRoute';
 import HumanPage from './features/human/HumanPage';
 import { getIsMobile } from './lib/platform';
 import Accounts from './pages/Accounts';
-import Activity from './pages/Activity';
 import Brain from './pages/Brain';
 import AgentInsightsPreview from './pages/dev/AgentInsightsPreview';
 import Home from './pages/Home';
@@ -88,20 +87,9 @@ const AppRoutes = () => {
         }
       />
 
-      {/* Primary Activity surface — replaces /intelligence (Phase 3). */}
-      <Route
-        path="/activity"
-        element={
-          <ProtectedRoute requireAuth={true}>
-            <Activity />
-          </ProtectedRoute>
-        }
-      />
-
-      {/* Back-compat: /intelligence → /activity (preserves ?tab= deep links).
-          Deep links such as ?tab=memory or ?tab=agents still resolve but fall
-          back to the tasks tab in prod (dev-only tabs are gated inside Activity). */}
-      <Route path="/intelligence" element={<Navigate to="/activity" replace />} />
+      {/* Back-compat: /activity and /intelligence → settings notifications hub. */}
+      <Route path="/activity" element={<Navigate to="/settings/notifications-hub" replace />} />
+      <Route path="/intelligence" element={<Navigate to="/settings/notifications-hub" replace />} />
 
       {/* Connections page lives at /connections (Phase 2 rename from /skills).
           The old /skills path is kept as a back-compat redirect so bookmarks
@@ -177,7 +165,7 @@ const AppRoutes = () => {
       {/* Back-compat: /routines was an orphaned dead page (superseded by the
           Cron Jobs settings panel).  Redirect to Activity → Automations so
           any surviving deep links land somewhere sensible. */}
-      <Route path="/routines" element={<Navigate to="/activity?tab=automations" replace />} />
+      <Route path="/routines" element={<Navigate to="/settings/automations" replace />} />
 
       <Route
         path="/rewards"
@@ -188,9 +176,7 @@ const AppRoutes = () => {
         }
       />
 
-      {/* Workflows moved onto the Activity page (Automations tab). Keep the
-          old /workflows path working as a deep link into that tab. */}
-      <Route path="/workflows" element={<Navigate to="/activity?tab=automations" replace />} />
+      <Route path="/workflows" element={<Navigate to="/settings/automations" replace />} />
 
       <Route path="/webhooks" element={<Navigate to="/settings/webhooks-triggers" replace />} />
 

app/src/components/BottomTabBar.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 
-import { AVATAR_MENU_ITEMS, CENTER_TAB, NAV_TABS } from '../config/navConfig';
+import { AVATAR_MENU_ITEMS, NAV_TABS } from '../config/navConfig';
 import { useT } from '../lib/i18n/I18nContext';
 import { useCoreState } from '../providers/CoreStateProvider';
 import { trackEvent } from '../services/analytics';
@@ -16,10 +16,8 @@ import { resolveUserName } from '../utils/userName';
 
 // ── SVG icons, keyed by tab id ────────────────────────────────────────────────
 
-function TabIcon({ id, large = false }: { id: string; large?: boolean }) {
-  // Regular pill tabs render small (w-4); the raised center FAB renders large
-  // (w-6) so its glyph reads as the centerpiece.
-  const cls = large ? 'w-6 h-6' : 'w-4 h-4';
+function TabIcon({ id }: { id: string }) {
+  const cls = 'w-4 h-4';
   switch (id) {
     case 'home':
       return (
@@ -95,8 +93,7 @@ function TabIcon({ id, large = false }: { id: string; large?: boolean }) {
         </svg>
       );
     case 'brain':
-      // Two symmetric lobes — reads clearly as a brain. Rendered larger and
-      // white inside the raised center circle.
+      // Two symmetric lobes — reads clearly as a brain.
       return (
         <svg className={cls} fill="none" stroke="currentColor" viewBox="0 0 24 24">
           <path
@@ -282,43 +279,8 @@ const BottomTabBar = () => {
     );
   };
 
-  // The Assistant — a raised circular button rising out of the center of the
-  // bar. The bg-colored ring fakes a notch cut into the pill's top edge.
-  // `center-fab` marks the button (test/identification hook); it renders a
-  // static glow when active — no pulse.
-  //
-  // `-my-3` collapses the button's 48px (h-12) layout footprint so it no longer
-  // forces the nav row taller than the ~32px pill tabs — the bar height is
-  // driven by the tabs, while `-translate-y-4` still lifts the circle above the
-  // top edge. Without it the lower half of the raised circle left a dead band
-  // of empty bar height beneath the tabs.
-  const renderCenterButton = () => {
-    const active = isActive(CENTER_TAB.path);
-    const centerTab = { ...CENTER_TAB, label: t(CENTER_TAB.labelKey) };
-    return (
-      <button
-        key={CENTER_TAB.id}
-        type="button"
-        data-walkthrough={CENTER_TAB.walkthroughAttr}
-        onClick={() => handleTabClick(centerTab, active)}
-        aria-label={centerTab.label}
-        title={centerTab.label}
-        className={`center-fab group relative mx-1 flex h-12 w-12 -my-3 -translate-y-4 items-center justify-center rounded-full text-white shadow-soft ring-4 ring-stone-200 transition-all duration-300 ease-[cubic-bezier(0.22,1,0.36,1)] cursor-pointer dark:ring-neutral-900 ${
-          active
-            ? 'bg-primary-600 shadow-[0_0_16px_rgba(74,131,221,0.55)] scale-105'
-            : 'bg-primary-500 hover:bg-primary-600 hover:scale-105'
-        }`}>
-        <TabIcon id={CENTER_TAB.id} large />
-      </button>
-    );
-  };
-
-  // Home is a normal pill tab now (no longer pinned/icon-only). The regular
-  // tabs split evenly around the centered Assistant button; only the avatar
-  // stays pinned to the far-right behind a divider:
-  //   | home · human · brain  ( 💬 )  connections · activity · settings | [ avatar ]
-  const leftTabs = tabs.slice(0, 3);
-  const rightTabs = tabs.slice(3);
+  // All tabs render as uniform pill buttons in a single row; the avatar
+  // stays pinned to the far-right behind a divider.
 
   return (
     // pointer-events-none on the full-width shell so transparent areas (e.g.
@@ -344,9 +306,7 @@ const BottomTabBar = () => {
           if (!e.currentTarget.contains(e.relatedTarget as Node)) setRevealed(false);
         }}>
         <nav className="pointer-events-auto inline-flex items-center gap-1 rounded-sm border border-stone-300 dark:border-neutral-700 bg-stone-200 dark:bg-neutral-900 shadow-soft px-1 py-1">
-          {leftTabs.map(tab => renderTab(tab))}
-          {renderCenterButton()}
-          {rightTabs.map(tab => renderTab(tab))}
+          {tabs.map(tab => renderTab(tab))}
           <div
             className="relative ml-1 border-l border-stone-300 pl-1 dark:border-neutral-700"
             ref={profileMenuRef}>

app/src/components/__tests__/BottomTabBar.test.tsx

@@ -1,14 +1,11 @@
 /**
  * Tests for BottomTabBar — verifies that:
- *  - 6 tabs are rendered (no Rewards tab; Human restored), Activity label is present
- *  - Assistant tab is present (was "Chat", id stays 'chat', label now 'Assistant')
- *  - Walkthrough attributes reflect the new ids (tab-connections, tab-activity)
+ *  - 6 tabs are rendered (no Rewards or Activity tab; Human restored; Chat is a regular tab)
+ *  - Chat tab is present (id 'chat', label 'Chat')
+ *  - Walkthrough attributes reflect the new ids (tab-connections)
  *  - Avatar menu opens and shows Account / Billing / Rewards / Invites / Wallet
  *  - Clicking an avatar menu item navigates or opens URL
  *  - The bar is hidden on '/' and '/login' paths
- *
- * Human tab restored as a first-class entry (after the IA Phase 6 merge into
- * Assistant); Chat keeps its "Assistant" label.
  */
 import { configureStore } from '@reduxjs/toolkit';
 import { fireEvent, render, screen } from '@testing-library/react';
@@ -167,14 +164,10 @@ describe('BottomTabBar', () => {
     agentProfilesApiMock.select.mockResolvedValue(testProfiles);
   });
 
-  it('renders exactly 6 regular tab buttons (Assistant is rendered separately)', async () => {
+  it('renders exactly 6 regular tab buttons (Chat is a regular tab)', async () => {
     await renderBottomTabBar('/home');
-    // Query only the regular pill tabs inside <nav>: exclude the avatar button
-    // (aria-haspopup) and the special raised Assistant center button (tab-chat).
     const nav = document.querySelector('nav');
-    const navButtons = nav?.querySelectorAll(
-      'button:not([aria-haspopup]):not([data-walkthrough="tab-chat"])'
-    );
+    const navButtons = nav?.querySelectorAll('button:not([aria-haspopup])');
     expect(navButtons).toHaveLength(6);
   });
 
@@ -188,19 +181,18 @@ describe('BottomTabBar', () => {
     expect(humanBtn.querySelector('.truncate')).not.toBeNull();
   });
 
-  it('renders the raised Assistant center button with data-walkthrough="tab-chat"', async () => {
+  it('renders the Chat tab with data-walkthrough="tab-chat"', async () => {
     await renderBottomTabBar('/home');
-    const assistantBtn = screen.getByRole('button', { name: 'Assistant' });
-    expect(assistantBtn).toBeInTheDocument();
-    expect(assistantBtn).toHaveAttribute('data-walkthrough', 'tab-chat');
-    expect(assistantBtn).toHaveClass('center-fab');
+    const chatBtn = screen.getByRole('button', { name: 'Chat' });
+    expect(chatBtn).toBeInTheDocument();
+    expect(chatBtn).toHaveAttribute('data-walkthrough', 'tab-chat');
   });
 
-  it('navigates to /chat and tracks the change when the Assistant center button is clicked', async () => {
+  it('navigates to /chat and tracks the change when the Chat tab is clicked', async () => {
     const { trackEvent } = await import('../../services/analytics');
     await renderBottomTabBar('/home');
 
-    fireEvent.click(screen.getByRole('button', { name: 'Assistant' }));
+    fireEvent.click(screen.getByRole('button', { name: 'Chat' }));
 
     expect(trackEvent).toHaveBeenCalledWith('tab_bar_change', {
       from_tab: 'home',
@@ -236,18 +228,16 @@ describe('BottomTabBar', () => {
     });
   });
 
-  it('renders the Activity tab', async () => {
+  it('does NOT render an Activity tab', async () => {
     await renderBottomTabBar('/home');
-    expect(screen.getByRole('button', { name: 'Activity' })).toBeInTheDocument();
+    expect(screen.queryByRole('button', { name: 'Activity' })).toBeNull();
   });
 
   it('renders the Brain tab in the regular row with data-walkthrough="tab-brain"', async () => {
     await renderBottomTabBar('/home');
     const brainBtn = screen.getByRole('button', { name: 'Brain' });
     expect(brainBtn).toBeInTheDocument();
     expect(brainBtn).toHaveAttribute('data-walkthrough', 'tab-brain');
-    // It's a regular pill tab now, not the raised center FAB.
-    expect(brainBtn).not.toHaveClass('center-fab');
   });
 
   it('renders the Connections tab with data-walkthrough="tab-connections"', async () => {
@@ -257,12 +247,6 @@ describe('BottomTabBar', () => {
     expect(connectionsBtn).toHaveAttribute('data-walkthrough', 'tab-connections');
   });
 
-  it('renders Activity tab with data-walkthrough="tab-activity"', async () => {
-    await renderBottomTabBar('/home');
-    const activityBtn = screen.getByRole('button', { name: 'Activity' });
-    expect(activityBtn).toHaveAttribute('data-walkthrough', 'tab-activity');
-  });
-
   it('renders Settings tab with data-walkthrough="tab-settings"', async () => {
     await renderBottomTabBar('/home');
     const settingsBtn = screen.getByRole('button', { name: 'Settings' });