@@ -4,7 +4,7 @@ import { type ReactNode, useCallback, useEffect, useRef, useState } from 'react'
 import { toast } from '@sim/emcn'
 import { toRecord } from '@sim/utils/object'
 import { useQueryClient } from '@tanstack/react-query'
-import { useQueryStates } from 'nuqs'
+import { createSerializer, useQueryStates } from 'nuqs'
 import { AssistantActionReviewProvider } from '@/components/assistant-actions'
 import { requestJson } from '@/lib/api/client/request'
 import type { WorkspaceSearchFilters } from '@/lib/api/contracts/knowledge'
@@ -16,6 +16,7 @@ import {
   getMothershipAttachmentUrl,
 } from '@/lib/mothership/chat/attachment-preview'
 import { createSearchResource } from '@/lib/mothership/resources/search'
+import { organizationRoutes } from '@/lib/navigation/paths'
 import { OrganizationLanding } from '@/app/o/[organizationId]/components/organization-landing'
 import { Composer } from '@/app/o/[organizationId]/home/components/composer'
 import { GetStarted } from '@/app/o/[organizationId]/home/components/get-started'
@@ -41,6 +42,7 @@ import {
 import { useRestoredChatEntry } from '@/app/workspace/[workspaceId]/home/hooks/use-restored-chat-entry'
 import { fetchWorkspaceResourceRef } from '@/app/workspace/[workspaceId]/home/resolve-resource-ref'
 import {
+  resourceParam,
   searchFilterParsers,
   searchFiltersFromParams,
 } from '@/app/workspace/[workspaceId]/home/search-params'
@@ -63,6 +65,12 @@ export interface OrganizationSummaryRequest {
   assistantSearch: WorkspaceSearchFilters
 }
 
+const serializeSearchConversation = createSerializer({
+  ...organizationSearchParsers,
+  ...searchFilterParsers,
+  [resourceParam.key]: resourceParam.parser,
+})
+
 interface OrganizationConversationProps {
   active?: boolean
   summaryRequest?: OrganizationSummaryRequest
@@ -110,17 +118,27 @@ function OrganizationConversationContent({
   const [planning, setPlanning] = useState(false)
   const requestMode =
     destinationMode === 'agent' && !chatId && planEnabled && planning ? 'plan' : destinationMode
-  const [{ q, source, updated, from, to }] = useQueryStates(
+  const [searchParams] = useQueryStates(
     { ...organizationSearchParsers, ...searchFilterParsers },
     organizationSearchUrlKeys
   )
+  const { q, source, updated, from, to } = searchParams
   const controller = useResourcePanelController()
   const queryClient = useQueryClient()
   const chat = useChat(
     { organizationId: organization.id },
     chatId,
     getMothershipUseChatOptions({
       requestMode,
+      getChatUrl:
+        destinationMode === 'assistant'
+          ? (id) =>
+              serializeSearchConversation(organizationRoutes(organization.id).searchChat(id), {
+                ...searchParams,
+                mode: active ? 'assistant' : 'search',
+                resource: controller.activeResourceState[0],
+              })
+          : undefined,
       onResourceEvent: controller.onResourceEvent,
       activeResourceState: controller.activeResourceState,
     })
 
@@ -27,13 +27,9 @@ export function assistantAccountOptions(data: OrganizationAccountsSettings, sear
   const providers = data.assistantProviders.filter(
     (provider) => !SEARCH_ACCOUNT_PROVIDERS.has(provider)
   )
-  const ownedOptions = new Set(data.viewerAccounts?.map((account) => account.optionId))
   const configured =
     data.credentialGroup?.options.filter(
-      (option) =>
-        !SEARCH_ACCOUNT_PROVIDERS.has(option.provider) &&
-        ((option.status === 'active' && providers.includes(option.provider)) ||
-          ownedOptions.has(option.id))
+      (option) => !SEARCH_ACCOUNT_PROVIDERS.has(option.provider)
     ) ?? []
   const query = search.trim().toLowerCase()
   const visible = configured.filter((option) =>
 
@@ -13,6 +13,42 @@ const liveId = (items: AgentGroupItem[], isOpen = true) => {
 }
 
 describe('getLaneLiveIndicator', () => {
+  it.each([false, true])(
+    'leaves the turn indicator visible when a settled action is lifted (nested: %s)',
+    (nested) => {
+      const action = call('action', 'jira_write')
+      const items: AgentGroupItem[] = nested
+        ? [
+            {
+              type: 'agent_group',
+              group: {
+                id: 'child',
+                agentName: 'research',
+                agentLabel: 'Research',
+                items: [action],
+                isDelegating: false,
+                isOpen: true,
+              },
+            },
+          ]
+        : [action]
+      const input = {
+        kind: 'subagent' as const,
+        parts: [items],
+        isActive: true,
+        isOpen: true,
+        standaloneToolIds: new Set(['action']),
+      }
+      expect(getLaneLiveIndicator(input)).toBeUndefined()
+      expect(
+        getLaneLiveIndicator({
+          ...input,
+          parts: [[...items, { type: 'text', content: 'Checking the result.' }]],
+        })
+      ).toEqual({ type: 'narration' })
+    }
+  )
+
   it('gives the gap to a succeeded trailing call, including search, never a failure', () => {
     expect(liveId([call('s', 'search_workspace'), call('a', 'read')])).toBe('a')
     expect(liveId([call('a', 'read'), call('s', 'search_workspace')])).toBe('s')
 
@@ -162,6 +162,18 @@ function getMainTrailingCall(
   return last?.type === 'run' ? last.run.tools.at(-1) : undefined
 }
 
+function hasVisibleLaneContent(
+  items: AgentGroupItem[],
+  standaloneToolIds?: ReadonlySet<string>
+): boolean {
+  return items.some((item) => {
+    if (item.type === 'tool') return !standaloneToolIds?.has(item.data.id)
+    if (item.type === 'agent_group')
+      return Boolean(item.group.error) || hasVisibleLaneContent(item.group.items, standaloneToolIds)
+    return hasAgentGroupItemContent(item)
+  })
+}
+
 /**
  * The one live indicator of a lane, if it has one. See
  * {@link getTurnLiveIndicators} for the rule this implements.
@@ -183,7 +195,7 @@ export function getLaneLiveIndicator({
   if (running) return { type: 'call', tool: running }
   if (!isOpen) return undefined
   if (kind === 'subagent' && calls.length === 0) {
-    return parts.some((items) => items.some(hasAgentGroupItemContent))
+    return parts.some((items) => hasVisibleLaneContent(items, standaloneToolIds))
       ? { type: 'narration' }
       : undefined
   }
 
@@ -1,12 +1,8 @@
 import { organizationRoutes } from '@/lib/navigation/paths'
-import { organizationSearchParsers } from '@/app/o/[organizationId]/search/search-params'
-import {
-  resourceParam,
-  searchFilterParsers,
-} from '@/app/workspace/[workspaceId]/home/search-params'
+import { resourceParam } from '@/app/workspace/[workspaceId]/home/search-params'
 import type { ChatRequestMode } from '@/app/workspace/[workspaceId]/home/types'
 
-/** Preserve resource and Search context when a new conversation receives its chat URL. */
+/** Preserve the selected resource when a new conversation receives its default chat URL. */
 export function chatUrl(
   owner: string | { organizationId: string },
   chatId: string,
@@ -17,17 +13,6 @@ export function chatUrl(
   const carried = new URLSearchParams()
   const resource = current.get(resourceParam.key)
   if (resource) carried.set(resourceParam.key, resource)
-  if (typeof owner === 'object' && mode === 'assistant') {
-    for (const key of Object.keys({ ...organizationSearchParsers, ...searchFilterParsers })) {
-      const value = current.get(key)
-      if (value) carried.set(key, value)
-    }
-    if (
-      organizationSearchParsers.mode.parse(current.get('mode') ?? '') === null &&
-      window.location.pathname === routes?.search
-    )
-      carried.set('mode', 'search')
-  }
   const search = carried.toString()
   const path = routes
     ? mode === 'assistant'
 
@@ -18,31 +18,16 @@ function chatSessionEvent(chatId: string): PersistedStreamEventEnvelope {
 }
 
 describe('handleSessionEvent', () => {
-  it.each([
-    ['assistant', '/o/organization-1/search/chat/chat-new'],
-    ['agent', '/o/organization-1/chat/chat-new'],
-    ['plan', '/o/organization-1/chat/chat-new'],
-  ] as const)(
-    'keeps a newly created %s conversation on its owning surface',
-    (requestMode, path) => {
-      window.history.replaceState(null, '', '/o/organization-1/search?view=assistant')
-      const deps = { ...makeStreamLoopDeps(), organizationId: 'organization-1', requestMode }
-      handleSessionEvent({ deps } as StreamLoopContext, chatSessionEvent('chat-new') as never)
-      expect(window.location.pathname).toBe(path)
-    }
-  )
-
   it('adopts a newly assigned chat before chatIdRef is written', () => {
     const deps = makeStreamLoopDeps()
-    deps.workflowIdRef.current = 'workflow-1'
     vi.mocked(deps.adoptResolvedChatId).mockImplementation((chatId) => {
       expect(deps.chatIdRef.current).toBeUndefined()
       deps.chatIdRef.current = chatId
     })
 
     handleSessionEvent({ deps } as StreamLoopContext, chatSessionEvent('chat-new') as never)
 
-    expect(deps.adoptResolvedChatId).toHaveBeenCalledWith('chat-new')
+    expect(deps.adoptResolvedChatId).toHaveBeenCalledWith('chat-new', { replaceHomeHistory: true })
     expect(deps.chatIdRef.current).toBe('chat-new')
   })
 })
@@ -1,7 +1,6 @@
 import { getLiveAssistantMessageId } from '@/lib/mothership/chat/live-message-id'
 import { MothershipStreamV1SessionKind } from '@/lib/mothership/generated/mothership-stream-v1'
 import type { PersistedStreamEventEnvelope } from '@/lib/mothership/request/session/contract'
-import { chatUrl } from '@/app/workspace/[workspaceId]/home/hooks/chat-url'
 import type { StreamLoopContext } from '@/app/workspace/[workspaceId]/home/hooks/stream/stream-context'
 import { type MothershipChatHistory, mothershipChatKeys } from '@/hooks/queries/mothership-chats'
 
@@ -24,7 +23,7 @@ export function handleSessionEvent(ctx: StreamLoopContext, parsed: SessionEvent)
       // This synchronously migrates provisional browser/terminal ownership
       // before writing chatIdRef. Assigning the ref here first would make the
       // adoption path believe there was no provisional scope to move.
-      deps.adoptResolvedChatId(payloadChatId)
+      deps.adoptResolvedChatId(payloadChatId, { replaceHomeHistory: true })
     } else {
       deps.chatIdRef.current = payloadChatId
       if (payloadChatId === selected) {
@@ -61,17 +60,6 @@ export function handleSessionEvent(ctx: StreamLoopContext, parsed: SessionEvent)
         )
       }
       deps.setPendingMessages([])
-      if (!deps.workflowIdRef.current) {
-        window.history.replaceState(
-          null,
-          '',
-          chatUrl(
-            deps.organizationId ? { organizationId: deps.organizationId } : deps.workspaceId!,
-            payloadChatId,
-            deps.requestMode
-          )
-        )
-      }
     }
   }
 
 
@@ -115,7 +115,7 @@ export interface StreamLoopDeps {
   setPendingMessages: Dispatch<SetStateAction<ChatMessage[]>>
   setResolvedChatId: Dispatch<SetStateAction<string | undefined>>
   /** Adopts a server-created chat before any event handler mutates chatIdRef. */
-  adoptResolvedChatId: (chatId: string) => void
+  adoptResolvedChatId: (chatId: string, options?: { replaceHomeHistory?: boolean }) => void
   setResources: Dispatch<SetStateAction<MothershipResource[]>>
   setActiveResourceId: Dispatch<SetStateAction<string | null>>
 
@@ -185,7 +185,6 @@ export interface StreamLoopDeps {
   pendingUserMsgRef: MutableRefObject<PersistedMessage | null>
   activeTurnRef: MutableRefObject<ActiveTurn | null>
   resourcesRef: MutableRefObject<MothershipResource[]>
-  workflowIdRef: MutableRefObject<string | undefined>
   activeResourceIdRef: MutableRefObject<string | null>
   onTitleUpdateRef: MutableRefObject<(() => void) | undefined>
   onToolResultRef: MutableRefObject<
 
@@ -79,7 +79,6 @@ export function makeStreamLoopDeps(overrides: Partial<StreamLoopDeps> = {}): Str
     pendingUserMsgRef: ref<PersistedMessage | null>(null),
     activeTurnRef: ref<ActiveTurn | null>(null),
     resourcesRef: ref<MothershipResource[]>([]),
-    workflowIdRef: ref<string | undefined>(undefined),
     activeResourceIdRef: ref<string | null>(null),
     onTitleUpdateRef: ref<(() => void) | undefined>(undefined),
     onToolResultRef: ref<
 
@@ -657,6 +657,8 @@ export function shouldQueueOutgoingMessage(
 export interface UseChatOptions {
   /** Intent for new turns; persisted chat intent remains authoritative on reload. */
   requestMode?: ChatRequestMode
+  /** Build the admitted conversation URL from the owning surface's current view state. */
+  getChatUrl?: (chatId: string) => string
   onResourceEvent?: ResourceEventHandler
   apiPath?: string
   stopPath?: string
@@ -707,6 +709,7 @@ export function getMothershipUseChatOptions(
     | 'activeResourceState'
     | 'onRequestStarted'
     | 'requestMode'
+    | 'getChatUrl'
   > = {}
 ): UseChatOptions {
   return {
@@ -771,6 +774,8 @@ export function useChat(
   const [activeResourceId, setActiveResourceId] =
     options?.activeResourceState ?? internalActiveResourceState
   const onResourceEventRef = useRef(options?.onResourceEvent)
+  const getChatUrlRef = useRef(options?.getChatUrl)
+  getChatUrlRef.current = options?.getChatUrl
   const revealedSimKeysRef = useRef<RevealedSimKeysByMessage | null>(null)
   const revealedSimKeys = (revealedSimKeysRef.current ??= new Map())
   onResourceEventRef.current = options?.onResourceEvent
@@ -1367,11 +1372,12 @@ export function useChat(
         window.history.replaceState(
           null,
           '',
-          chatUrl(
-            organizationId ? { organizationId } : workspaceId!,
-            chatId,
-            requestModeRef.current
-          )
+          getChatUrlRef.current?.(chatId) ??
+            chatUrl(
+              organizationId ? { organizationId } : workspaceId!,
+              chatId,
+              requestModeRef.current
+            )
         )
       }
       if (options?.invalidateList) {
@@ -2414,7 +2420,6 @@ export function useChat(
         pendingUserMsgRef,
         activeTurnRef,
         resourcesRef,
-        workflowIdRef,
         activeResourceIdRef,
         onTitleUpdateRef,
         onToolResultRef,