fix(app): set the added provider or agent as the active chat target before handoff

Author: DaniAkash

packages/browseros-agent/apps/app/screens/ai-settings/CustomCodingAgentDialog.tsx

@@ -44,8 +44,8 @@ export interface CustomCodingAgentDialogProps {
   onOpenChange: (open: boolean) => void
   /** When set, the dialog edits this agent instead of creating a new one. */
   agent?: AcpAgent | null
-  /** Fires after a new custom agent is successfully created (not on edit). */
-  onSaved?: () => void
+  /** Fires with the new agent's id after a custom agent is created (not on edit). */
+  onSaved?: (agentId: string) => void
 }
 
 export const CustomCodingAgentDialog: FC<CustomCodingAgentDialogProps> = ({
@@ -124,6 +124,7 @@ export const CustomCodingAgentDialog: FC<CustomCodingAgentDialogProps> = ({
       systemPromptAppend,
       icon: logoKey,
     })
+    let createdId: string | undefined
     if (isEdit && agent) {
       await updateAgent.mutateAsync({
         agentId: agent.id,
@@ -136,17 +137,18 @@ export const CustomCodingAgentDialog: FC<CustomCodingAgentDialogProps> = ({
         },
       })
     } else {
-      await createAgent.mutateAsync({
+      const created = await createAgent.mutateAsync({
         name: name.trim(),
         type: 'custom',
         modelId: modelId || undefined,
         reasoningEffort: reasoningEffort || undefined,
         workingDirectory: workingDirectory.trim() || undefined,
         customConfig,
       })
+      createdId = created.id
     }
     onOpenChange(false)
-    if (!agent) onSaved?.()
+    if (createdId) onSaved?.(createdId)
   }
 
   return (

packages/browseros-agent/apps/app/screens/ai-settings/NewCodingAgentDialog.tsx

@@ -29,8 +29,8 @@ export interface NewCodingAgentDialogProps {
   type: AcpAgentType | null
   open: boolean
   onOpenChange: (open: boolean) => void
-  /** Fires after the agent is successfully created. */
-  onSaved?: () => void
+  /** Fires with the new agent's id after it is successfully created. */
+  onSaved?: (agentId: string) => void
 }
 
 export const NewCodingAgentDialog: FC<NewCodingAgentDialogProps> = ({
@@ -58,14 +58,14 @@ export const NewCodingAgentDialog: FC<NewCodingAgentDialogProps> = ({
 
   const handleCreate = async () => {
     if (!type || !name.trim()) return
-    await createAgent.mutateAsync({
+    const created = await createAgent.mutateAsync({
       name: name.trim(),
       type,
       modelId: modelId || undefined,
       reasoningEffort: reasoningEffort || undefined,
     })
     onOpenChange(false)
-    onSaved?.()
+    onSaved?.(created.id)
   }
 
   return (

packages/browseros-agent/apps/app/screens/ai-settings/add-provider.hooks.tsx

@@ -99,7 +99,7 @@ interface AddProviderDialogState {
   activeDeviceCode: ReturnType<typeof useOAuthProviderFlow>['pendingDeviceCode']
   clearActiveDeviceCode: () => void
   onSaveProvider: (provider: LlmProviderConfig) => Promise<void>
-  onAgentAdded?: () => void
+  onAgentAdded?: (agentId: string) => void
 }
 
 /**
@@ -121,7 +121,7 @@ export function useAddProvider(input: {
   /** Fires once a provider is successfully added on any path, OAuth included. */
   onProviderAdded?: (provider: LlmProviderConfig) => void | Promise<void>
   /** Fires once a coding agent is successfully created. */
-  onAgentAdded?: () => void
+  onAgentAdded?: (agentId: string) => void
 }): AddProviderController {
   const {
     providers,

packages/browseros-agent/apps/app/screens/onboarding-ai/OnboardingAiPage.tsx

@@ -1,5 +1,6 @@
 import type { FC } from 'react'
 import { useNavigate } from 'react-router'
+import { commitChatTargetSelection } from '@/modules/chat/sidepanel-chat-targets'
 import { useLlmProviders } from '@/modules/llm-providers/llm-providers.hooks'
 import { AddProviderSection } from '@/screens/ai-settings/AddProviderSection'
 import {
@@ -26,16 +27,27 @@ export const OnboardingAiPage: FC = () => {
   const goHome = () => navigate('/home', { replace: true })
 
   // Adding a provider or a coding agent both count as connecting something, so
-  // either hands off to the new tab page. A newly added provider also becomes
-  // the default so the user's first chat uses what they just set up.
+  // either makes what was just added the active chat target and then hands off.
+  // commitChatTargetSelection writes the unified selection new chats read (and
+  // updates the default-provider id for an LLM target); await it before the hop
+  // so the new tab page opens on the target the user just set up.
   const addProvider = useAddProvider({
     providers,
     saveProvider,
     onProviderAdded: async (provider) => {
-      await setDefaultProvider(provider.id)
+      await commitChatTargetSelection(
+        { kind: 'llm', id: provider.id },
+        { setDefaultProvider },
+      )
+      goHome()
+    },
+    onAgentAdded: async (agentId) => {
+      await commitChatTargetSelection(
+        { kind: 'acp', id: agentId },
+        { setDefaultProvider },
+      )
       goHome()
     },
-    onAgentAdded: goHome,
   })
 
   return (