@@ -13,6 +13,7 @@ const mocks = vi.hoisted(() => ({
   assistant: vi.fn(),
   urlUpdate: vi.fn(),
   push: vi.fn(),
+  pathname: vi.fn(),
   speech: vi.fn<typeof useSpeechToText>(),
   toggleListening: vi.fn(),
 }))
@@ -23,7 +24,7 @@ vi.mock('@/app/o/[organizationId]/home/organization-home', () => ({
 vi.mock('@/hooks/use-speech-to-text', () => ({ useSpeechToText: mocks.speech }))
 vi.mock('next/navigation', () => ({
   useRouter: () => ({ push: mocks.push }),
-  usePathname: () => '/o/organization-a/search',
+  usePathname: mocks.pathname,
 }))
 vi.mock('@/app/o/[organizationId]/providers/organization-provider', () => ({
   useOrganizationContext: () => ({
@@ -64,6 +65,7 @@ let container: HTMLDivElement
 
 beforeEach(() => {
   vi.clearAllMocks()
+  mocks.pathname.mockReturnValue('/o/organization-a/search')
   mocks.assistant.mockReturnValue(<div>Search Assistant composer</div>)
   vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true)
   vi.stubGlobal(
@@ -227,6 +229,35 @@ describe('organization Search query navigation', () => {
 })
 
 describe('organization Search intent toggle', () => {
+  it('keeps the live Assistant mounted when the first message replaces the URL with a chat route', async () => {
+    await render('?view=assistant')
+    const composer = Array.from(container.querySelectorAll('div')).find(
+      (node) => node.textContent === 'Search Assistant composer' && node.childElementCount === 0
+    )
+    expect(composer).toBeDefined()
+    mocks.pathname.mockReturnValue('/o/organization-a/chat/new-chat')
+    await render('')
+    expect(container.contains(composer!)).toBe(true)
+    expect(container.querySelector('input[aria-label="Search your sources"]')).toBeNull()
+    expect(mocks.assistant).toHaveBeenLastCalledWith(
+      expect.objectContaining({ requestMode: 'assistant', chatId: undefined }),
+      undefined
+    )
+    expect(
+      container.querySelector('[role="radio"][value="assistant"]')?.getAttribute('aria-checked')
+    ).toBe('true')
+    await act(async () =>
+      container.querySelector<HTMLButtonElement>('[role="radio"][value="results"]')!.click()
+    )
+    expect(mocks.push).toHaveBeenCalledWith('/o/organization-a/search?')
+  })
+
+  it('does not treat another organization chat path as this organization Assistant', async () => {
+    mocks.pathname.mockReturnValue('/o/organization-other/chat/chat')
+    await render('')
+    expect(searchInput()).toBeDefined()
+    expect(mocks.assistant).not.toHaveBeenCalled()
+  })
   it('preserves committed query and filters without submitting an Assistant turn', async () => {
     await render('?q=Orion&source=slack&updated=7d')
     await act(async () =>
 
@@ -11,7 +11,7 @@ import {
   useScrollEdges,
 } from '@sim/emcn'
 import { ArrowUp, Search } from '@sim/emcn/icons'
-import { useRouter } from 'next/navigation'
+import { usePathname, useRouter } from 'next/navigation'
 import { useQueryStates } from 'nuqs'
 import { HEADER_ACTION_CLUSTER, PAGE_HEADER_BAR } from '@/components/page-header-bar'
 import type { WorkspaceSearchFilters } from '@/lib/api/contracts/knowledge'
@@ -155,6 +155,7 @@ export function OrganizationSearch(props: OrganizationSearchProps) {
 function OrganizationSearchContent({ chatId, userName }: OrganizationSearchProps) {
   const { organization } = useOrganizationContext()
   const router = useRouter()
+  const pathname = usePathname()
   const [{ q, view }, setParams] = useQueryStates(
     organizationSearchParsers,
     organizationSearchUrlKeys
@@ -182,7 +183,10 @@ function OrganizationSearchContent({ chatId, userName }: OrganizationSearchProps
   }
 
   const searching = query.length > 0
-  const activeView = chatId ? 'assistant' : view
+  /** First-message admission replaces browser history without replacing this page's server props. */
+  const isChatRoute =
+    Boolean(chatId) || Boolean(pathname?.startsWith(organizationRoutes(organization.id).chat('')))
+  const activeView = isChatRoute ? 'assistant' : view
 
   return (
     <div className='flex h-full min-h-0 flex-col bg-[var(--bg)]'>
@@ -194,7 +198,7 @@ function OrganizationSearchContent({ chatId, userName }: OrganizationSearchProps
             aria-label='Search view'
             onValueChange={(next) => {
               if (next !== 'results' && next !== 'assistant') return
-              if (chatId) {
+              if (isChatRoute) {
                 router.push(
                   `${organizationRoutes(organization.id).search}?${new URLSearchParams({ ...(q ? { q } : {}), ...(filters.source ? { source: filters.source } : {}), ...(filters.updated !== 'any' ? { updated: filters.updated } : {}), ...(next === 'assistant' ? { view: next } : {}) })}`
                 )
 
@@ -9,11 +9,17 @@ const {
   mockCreateCopilotManagedOAuthPrincipal,
   mockResolveCredentialAccessToken,
   mockPersonalCredentialUseCase,
+  mockOrganizationPersonalToken,
 } = vi.hoisted(() => ({
   mockBindExecutorManagedOAuthDelegation: vi.fn(),
   mockCreateCopilotManagedOAuthPrincipal: vi.fn(),
   mockResolveCredentialAccessToken: vi.fn(),
   mockPersonalCredentialUseCase: vi.fn(),
+  mockOrganizationPersonalToken: vi.fn(),
+}))
+
+vi.mock('@/lib/mothership/application/resolve-organization-personal-token', () => ({
+  resolveCopilotOrganizationPersonalToken: mockOrganizationPersonalToken,
 }))
 
 vi.mock('@/lib/credentials/application/copilot-managed-oauth-delegation', () => ({
@@ -25,7 +31,7 @@ vi.mock('@/lib/mothership/application/execute-credential-use-case', () => ({
 }))
 vi.mock('@/tools/metadata', () => ({
   getToolMetadata: (id: string) =>
-    id === 'gmail_read' ? { oauth: { required: true, provider: 'google-email' } } : undefined,
+    id === 'gmail_read' ? { id, oauth: { required: true, provider: 'google-email' } } : undefined,
 }))
 
 vi.mock('@/lib/oauth/token-resolution', () => ({
@@ -54,6 +60,38 @@ describe('resolveExecutorCredentialToken', () => {
     })
   })
 
+  it('uses organization-native personal authority without reaching workspace token resolution', async () => {
+    const context = {
+      userId: 'user-1',
+      organizationId: 'org',
+      chatId: 'chat',
+      toolCallId: 'call',
+      copilotToolExecution: true,
+      requestMode: 'assistant',
+    }
+    mockOrganizationPersonalToken.mockResolvedValue({
+      accessToken: 'own-token',
+      credentialType: 'managed_oauth',
+    })
+    const token = await resolveExecutorCredentialToken({
+      requestId: 'req',
+      credentialId: 'own',
+      userId: 'user-1',
+      toolId: 'gmail_read',
+      scopes: ['read'],
+      copilotExecutionContext: context,
+    })
+    expect(token.accessToken).toBe('own-token')
+    expect(mockOrganizationPersonalToken).toHaveBeenCalledWith(context, {
+      credentialId: 'own',
+      expectedProviderId: 'google-email',
+      requiredScopes: ['read'],
+      toolId: 'gmail_read',
+    })
+    expect(mockPersonalCredentialUseCase).not.toHaveBeenCalled()
+    expect(mockResolveCredentialAccessToken).not.toHaveBeenCalled()
+  })
+
   it('dispatches with an internal-JWT auth result for the executing user', async () => {
     await resolveExecutorCredentialToken({
       requestId: 'req-1',
 
@@ -4,6 +4,7 @@ import { createCopilotManagedOAuthPrincipal } from '@/lib/credentials/applicatio
 import { bindExecutorManagedOAuthDelegation } from '@/lib/credentials/application/managed-oauth-delegation'
 import { authorizePersonalCredential } from '@/lib/credentials/application/personal-credentials'
 import { executeCopilotCredentialUseCase } from '@/lib/mothership/application/execute-credential-use-case'
+import { resolveCopilotOrganizationPersonalToken } from '@/lib/mothership/application/resolve-organization-personal-token'
 import type { CopilotExecutionContext } from '@/lib/mothership/auth/application-delegation'
 import {
   type CredentialTokenPayload,
@@ -61,11 +62,25 @@ export async function resolveExecutorCredentialToken(
       throw new Error('Assistant credential use requires the authenticated person for this turn.')
     }
     const tool = toolId ? getToolMetadata(toolId) : undefined
-    if (!tool?.oauth?.required || !copilotExecutionContext.workspaceId || params.impersonateEmail) {
+    if (
+      !tool?.oauth?.required ||
+      (!copilotExecutionContext.workspaceId && !copilotExecutionContext.organizationId) ||
+      params.impersonateEmail
+    ) {
       throw new Error(
         'Assistant requires your own connected account and cannot impersonate another user.'
       )
     }
+    if (copilotExecutionContext.organizationId) {
+      return resolveCopilotOrganizationPersonalToken(copilotExecutionContext, {
+        credentialId,
+        expectedProviderId: tool.oauth.provider,
+        requiredScopes: params.scopes ?? [],
+        toolId: tool.id,
+      })
+    }
+    if (!copilotExecutionContext.workspaceId)
+      throw new Error('Workspace credential scope is required')
     await executeCopilotCredentialUseCase(copilotExecutionContext, authorizePersonalCredential, {
       workspaceId: copilotExecutionContext.workspaceId,
       credentialId,