feat: unify agents & BrowserOS AI (one picker, merged settings)

packages/browseros-agent/apps/agent/components/sidebar/SettingsSidebar.tsx

@@ -59,7 +59,7 @@ const primarySettingsSections: NavSection[] = [
   {
     label: 'Provider Settings',
     items: [
-      { name: 'BrowserOS AI', to: '/settings/ai', icon: Bot },
+      { name: 'AI & Agents', to: '/settings/ai', icon: Bot },
       {
         name: 'Chat & Council Provider',
         to: '/settings/chat',

packages/browseros-agent/apps/agent/components/sidebar/SidebarNavigation.tsx

@@ -1,4 +1,4 @@
-import { CalendarClock, Cpu, Home, PlugZap, Settings } from 'lucide-react'
+import { CalendarClock, Home, PlugZap, Settings } from 'lucide-react'
 import type { FC } from 'react'
 import { NavLink, useLocation } from 'react-router'
 import {
@@ -31,12 +31,6 @@ const primaryNavItems: NavItem[] = [
     feature: Feature.MANAGED_MCP_SUPPORT,
   },
   { name: 'Scheduled Tasks', to: '/scheduled', icon: CalendarClock },
-  {
-    name: 'Agents',
-    to: '/agents',
-    icon: Cpu,
-    feature: Feature.ALPHA_FEATURES_SUPPORT,
-  },
   {
     name: 'Settings',
     to: '/settings/ai',
@@ -49,10 +43,6 @@ function isNavItemActive(item: NavItem, pathname: string): boolean {
     return pathname.startsWith('/settings')
   }
 
-  if (item.to === '/agents') {
-    return pathname === '/agents' || pathname.startsWith('/agents/')
-  }
-
   return pathname === item.to
 }
 

packages/browseros-agent/apps/agent/entrypoints/app/App.tsx

@@ -13,7 +13,6 @@ import { StepsLayout } from '../onboarding/steps/StepsLayout'
 import { AgentCommandConversation } from './agent-command/AgentCommandConversation'
 import { AgentCommandHome } from './agent-command/AgentCommandHome'
 import { AgentCommandLayout } from './agent-command/agent-command-layout'
-import { AgentsPage } from './agents/AgentsPage'
 import { AISettingsPage } from './ai-settings/AISettingsPage'
 import { ConnectMCP } from './connect-mcp/ConnectMCP'
 import { CustomizationPage } from './customization/CustomizationPage'
@@ -38,6 +37,13 @@ function getSurveyParams(): { maxTurns?: number; experimentId?: string } {
   return { maxTurns, experimentId }
 }
 
+// Agent management moved into AI & Agents settings; conversations live under
+// /home/agents. Keep old /agents links alive.
+const LegacyAgentRedirect: FC = () => {
+  const params = useParams()
+  return <Navigate to={`/home/agents/${params.agentId ?? ''}`} replace />
+}
+
 const OptionsRedirect: FC = () => {
   const params = useParams()
   const path = params['*'] || ''
@@ -100,24 +106,6 @@ export const App: FC = () => {
           {/* Primary nav routes */}
           <Route path="connect-apps" element={<ConnectMCP />} />
           <Route path="scheduled" element={<ScheduledTasksPage />} />
-          {alphaEnabled ? (
-            <>
-              <Route path="agents" element={<AgentsPage />} />
-              <Route element={<AgentCommandLayout />}>
-                <Route
-                  path="agents/:agentId"
-                  element={
-                    <AgentCommandConversation
-                      variant="page"
-                      backPath="/agents"
-                      agentPathPrefix="/agents"
-                      createAgentPath="/agents"
-                    />
-                  }
-                />
-              </Route>
-            </>
-          ) : null}
         </Route>
 
         {/* Settings with dedicated sidebar */}
@@ -167,6 +155,11 @@ export const App: FC = () => {
           element={<Navigate to="/home" replace />}
         />
         <Route path="/executions" element={<Navigate to="/home" replace />} />
+        <Route
+          path="/agents"
+          element={<Navigate to="/settings/ai?section=claude" replace />}
+        />
+        <Route path="/agents/:agentId" element={<LegacyAgentRedirect />} />
         <Route path="/options/*" element={<OptionsRedirect />} />
 
         {/* Fallback to home */}

packages/browseros-agent/apps/agent/entrypoints/app/agent-command/AgentCommandConversation.tsx

@@ -37,17 +37,12 @@ function AgentConversationController({
   initialMessage,
   onInitialMessageConsumed,
   agents,
-  agentPathPrefix,
-  createAgentPath,
 }: {
   agentId: string
   initialMessage: string | null
   onInitialMessageConsumed: () => void
   agents: AgentEntry[]
-  agentPathPrefix: string
-  createAgentPath: string
 }) {
-  const navigate = useNavigate()
   const initialMessageSentRef = useRef<string | null>(null)
   const onInitialMessageConsumedRef = useRef(onInitialMessageConsumed)
   const agent = agents.find((entry) => entry.agentId === agentId)
@@ -158,10 +153,6 @@ function AgentConversationController({
     void sendRef.current({ text: query })
   }, [agentId, disabled, historyReady, initialMessage, initialMessageKey])
 
-  const handleSelectAgent = (entry: AgentEntry) => {
-    navigate(`${agentPathPrefix}/${entry.agentId}`)
-  }
-
   return (
     <div className="flex min-h-0 flex-1 flex-col overflow-hidden">
       <AgentChat
@@ -191,9 +182,6 @@ function AgentConversationController({
           ) : null}
           <ConversationInput
             variant="conversation"
-            agents={agents}
-            selectedAgentId={agentId}
-            onSelectAgent={handleSelectAgent}
             onSend={(input) => {
               const attachments = input.attachments.map((a) => a.payload)
               const attachmentPreviews = input.attachments.map((a) => ({
@@ -217,11 +205,9 @@ function AgentConversationController({
               }
               void send({ text: input.text, attachments, attachmentPreviews })
             }}
-            onCreateAgent={() => navigate(createAgentPath)}
             onStop={handleStop}
             streaming={streaming}
             disabled={disabled}
-            status="running"
             attachmentsEnabled={true}
             placeholder={
               streaming
@@ -239,7 +225,6 @@ interface AgentCommandConversationProps {
   variant?: 'command' | 'page'
   backPath?: string
   agentPathPrefix?: string
-  createAgentPath?: string
 }
 
 function inferAdapterFromEntry(
@@ -260,7 +245,6 @@ export const AgentCommandConversation: FC<AgentCommandConversationProps> = ({
   variant = 'command',
   backPath = '/home',
   agentPathPrefix = '/home/agents',
-  createAgentPath = '/agents',
 }) => {
   const { agentId } = useParams<{ agentId: string }>()
   const [searchParams, setSearchParams] = useSearchParams()
@@ -369,8 +353,6 @@ export const AgentCommandConversation: FC<AgentCommandConversationProps> = ({
               onInitialMessageConsumed={() => {
                 setSearchParams(() => new URLSearchParams(), { replace: true })
               }}
-              agentPathPrefix={agentPathPrefix}
-              createAgentPath={createAgentPath}
             />
           </div>
         </div>