@@ -167,9 +167,8 @@ describe('organization voice composer', () => {
     async (isInitialView) => {
       await render(isInitialView)
       const mic = container.querySelector<HTMLButtonElement>('button[aria-label="Voice input"]')!
-      expect(mic.previousElementSibling?.getAttribute('aria-label')).toBe(
-        'Model and reasoning effort'
-      )
+      expect(container.querySelector('[aria-label="Model and reasoning effort"]')).toBeNull()
+      expect(container.querySelector('[aria-label="Fast mode"]')).toBeNull()
       expect(mic.nextElementSibling?.getAttribute('aria-label')).toBe('Send')
       await act(async () => mic.click())
       expect(mocks.toggleListening).toHaveBeenCalledOnce()
@@ -406,12 +405,22 @@ it('keeps restored queued skills scoped when replacing a draft', async () => {
   ])
 })
 
-it('does not expose resource or skill controls in Search', async () => {
-  await render(true)
-  expect(container.querySelector('[aria-label="Skills"]')).toBeNull()
-  expect(container.querySelector('[aria-label="Add resources"]')).toBeNull()
-  expect(container.querySelector('[aria-label="Attach images"]')).not.toBeNull()
-})
+it.each([true, false])(
+  'hides Build controls in Search (can choose mode: %s)',
+  async (canChoose) => {
+    await render(true, '', 'assistant', {
+      isSending: false,
+      showModeSelector: canChoose,
+      onModeChange: vi.fn(),
+    })
+    expect(container.querySelector('[aria-label="Skills"]')).toBeNull()
+    expect(container.querySelector('[aria-label="Add resources"]')).toBeNull()
+    expect(container.querySelector('[aria-label="Model and reasoning effort"]')).toBeNull()
+    expect(container.querySelector('[aria-label="Fast mode"]')).toBeNull()
+    expect(Boolean(container.querySelector('[aria-label="Conversation mode"]'))).toBe(canChoose)
+    expect(container.querySelector('[aria-label="Attach images"]')).not.toBeNull()
+  }
+)
 
 it('lists organization-owned legacy workspaces in the resource picker', async () => {
   await render(true, '', 'agent')
 
@@ -107,8 +107,9 @@ export function Composer({
       editorRef.current.setValue(value)
       if (!value) editorRef.current.setContexts([])
       lastPublished.current = value
+      if (value) textareaRef.current?.focus()
     }
-  }, [value])
+  }, [value, textareaRef])
   useEffect(() => {
     if (editorRef.current.getValue() !== editor.value) return
     if (editor.value !== lastPublished.current) {
@@ -146,8 +147,12 @@ export function Composer({
   const canSubmit =
     !files.attachedFiles.some((file) => file.uploading) &&
     (value.trim().length > 0 || files.attachedFiles.some((file) => file.key))
-  const animatedPlaceholder = useAnimatedPlaceholder(isInitialView)
-  const placeholder = isInitialView ? animatedPlaceholder : 'Send message to Sim'
+  const animatedPlaceholder = useAnimatedPlaceholder(isInitialView && !imagesOnly)
+  const placeholder = isInitialView
+    ? imagesOnly
+      ? 'Search your sources'
+      : animatedPlaceholder
+    : 'Send message to Sim'
 
   const submit = () => {
     if (!canSubmit) return
@@ -213,6 +218,7 @@ export function Composer({
       />
 
       <InputToolbar
+        showModelSelector={!imagesOnly}
         leadingControls={
           <>
             {!imagesOnly && contextPicker('resources', Plus, 'Add resources')}
 
@@ -23,6 +23,7 @@ const mocks = vi.hoisted(() => ({
   upload: vi.fn(),
   addResource: vi.fn(),
 }))
+vi.mock('@/blocks/integration-matcher', () => ({ mentionifyIntegrations: (text: string) => text }))
 vi.mock('next/navigation', () => ({ useRouter: () => ({ push: mocks.push }) }))
 vi.mock('@tanstack/react-query', () => ({ useQueryClient: () => ({ fetchQuery: vi.fn() }) }))
 vi.mock('@/app/workspace/[workspaceId]/home/hooks/use-resource-panel', () => ({
@@ -54,6 +55,13 @@ vi.mock('@/hooks/queries/mothership-chats', () => ({
   useMarkMothershipChatRead: () => ({ mutate: mocks.markRead }),
 }))
 vi.mock('@/app/o/[organizationId]/home/components/composer', () => ({ Composer: mocks.composer }))
+vi.mock('@/app/workspace/[workspaceId]/home/components/suggested-actions', () => ({
+  SuggestedActions: ({ onSelectPrompt }: { onSelectPrompt: (prompt: string) => void }) => (
+    <button onClick={() => onSelectPrompt('Create a CRM with sample data.')}>
+      Suggested actions
+    </button>
+  ),
+}))
 vi.mock('@/hooks/queries/kb/connectors', () => ({ useSearchSourceOverview: mocks.sources }))
 vi.mock('@/hooks/queries/api-keys', () => ({ useApiKeys: mocks.apiKeys }))
 vi.mock('@/hooks/queries/oauth-provider', () => ({ useAuthorizedApps: mocks.authorizedApps }))
@@ -80,7 +88,7 @@ beforeEach(() => {
   )
   mocks.upload.mockResolvedValue({ key: 'image-key', path: '/image-path' })
   mocks.context.mockReturnValue({
-    organization: { id: 'organization-a' },
+    organization: { id: 'organization-a', name: 'Acme' },
     searchAccess: { memberScoped: true },
     mothershipAvailable: true,
     canBuild: true,
@@ -159,7 +167,8 @@ describe('organization home', () => {
     await act(async () => renderHome(<OrganizationHome userName='Ada Lovelace' />))
     expect(container.textContent).toContain('What should we get done, Ada?')
     expect(container.textContent).toContain('Question composer')
-    expect(container.textContent).toContain('Get started')
+    expect(container.textContent).toContain('Suggested actions')
+    expect(container.textContent).not.toContain('Get started')
     expect(mocks.renderer).not.toHaveBeenCalled()
     expect(mocks.chat).toHaveBeenCalledWith(
       { organizationId: 'organization-a' },
@@ -240,13 +249,13 @@ describe('organization home', () => {
     'routes onboarding for admin=$isAdmin without a workspace creation requirement',
     async ({ isAdmin, integrationHref }) => {
       mocks.context.mockReturnValue({
-        organization: { id: 'organization-a' },
+        organization: { id: 'organization-a', name: 'Acme' },
         searchAccess: { memberScoped: true },
         mothershipAvailable: true,
         canBuild: true,
         viewer: { isAdmin, canUseSearchMcp: true },
       })
-      await act(async () => renderHome(<OrganizationHome />))
+      await act(async () => renderHome(<OrganizationHome requestMode='assistant' />))
       expect(
         Array.from(container.querySelectorAll('a')).map((link) => ({
           label: link.textContent,
@@ -265,21 +274,21 @@ describe('organization home', () => {
   )
   it('does not complete MCP onboarding for an unrelated personal API key', async () => {
     mocks.apiKeys.mockReturnValue({ data: { personalKeys: [{ id: 'workflow-api-key' }] } })
-    await act(async () => renderHome(<OrganizationHome />))
+    await act(async () => renderHome(<OrganizationHome requestMode='assistant' />))
     expect(hasCompletedMcpStep()).toBe(false)
     expect(mocks.apiKeys).not.toHaveBeenCalled()
   })
 
   it('hides MCP onboarding and stops authorization paging when organization policy blocks access', async () => {
     mocks.context.mockReturnValue({
-      organization: { id: 'organization-a' },
+      organization: { id: 'organization-a', name: 'Acme' },
       searchAccess: { memberScoped: true },
       mothershipAvailable: true,
       canBuild: true,
       viewer: { isAdmin: false, canUseSearchMcp: false },
     })
     mockAuthorizedApps([{ apps: [], nextCursor: 'older-apps' }])
-    await act(async () => renderHome(<OrganizationHome />))
+    await act(async () => renderHome(<OrganizationHome requestMode='assistant' />))
     expect(container.textContent).not.toContain('Connect Sim Search MCP')
     expect(container.textContent).toContain('Connect an integration')
     expect(mocks.authorizedApps).toHaveBeenCalledWith('', { enabled: false })
@@ -295,7 +304,7 @@ describe('organization home', () => {
     { scopes: ['unrecognized:read'], completed: false },
   ])('derives MCP completion from OAuth scopes $scopes', async ({ scopes, completed }) => {
     mockAuthorizedApps([{ apps: [authorizedApp(scopes)], nextCursor: null }])
-    await act(async () => renderHome(<OrganizationHome />))
+    await act(async () => renderHome(<OrganizationHome requestMode='assistant' />))
     expect(hasCompletedMcpStep()).toBe(completed)
   })
 
@@ -305,15 +314,15 @@ describe('organization home', () => {
       nextCursor: 'older-apps',
     }
     mockAuthorizedApps([firstPage])
-    await act(async () => renderHome(<OrganizationHome />))
+    await act(async () => renderHome(<OrganizationHome requestMode='assistant' />))
     expect(hasCompletedMcpStep()).toBe(false)
     expect(mocks.fetchNextPage).toHaveBeenCalledTimes(1)
 
     mockAuthorizedApps([
       firstPage,
       { apps: [authorizedApp(['search:read'])], nextCursor: 'even-older-apps' },
     ])
-    await act(async () => renderHome(<OrganizationHome />))
+    await act(async () => renderHome(<OrganizationHome requestMode='assistant' />))
     expect(hasCompletedMcpStep()).toBe(true)
     expect(mocks.fetchNextPage).toHaveBeenCalledTimes(1)
   })
@@ -322,19 +331,19 @@ describe('organization home', () => {
     'does not start another authorization page request while %j',
     async (state) => {
       mockAuthorizedApps([{ apps: [], nextCursor: 'older-apps' }], state)
-      await act(async () => renderHome(<OrganizationHome />))
+      await act(async () => renderHome(<OrganizationHome requestMode='assistant' />))
       expect(mocks.fetchNextPage).not.toHaveBeenCalled()
       expect(hasCompletedMcpStep()).toBe(false)
     }
   )
 
   it('clears MCP completion when the Search authorization is revoked', async () => {
     mockAuthorizedApps([{ apps: [authorizedApp(['search:read'])], nextCursor: null }])
-    await act(async () => renderHome(<OrganizationHome />))
+    await act(async () => renderHome(<OrganizationHome requestMode='assistant' />))
     expect(hasCompletedMcpStep()).toBe(true)
 
     mockAuthorizedApps([{ apps: [], nextCursor: null }])
-    await act(async () => renderHome(<OrganizationHome />))
+    await act(async () => renderHome(<OrganizationHome requestMode='assistant' />))
     expect(hasCompletedMcpStep()).toBe(false)
   })
 
@@ -459,7 +468,7 @@ describe('organization home', () => {
 
 it('uses agent mode on new Home and does not consume a Search handoff', async () => {
   mocks.context.mockReturnValue({
-    organization: { id: 'organization-a' },
+    organization: { id: 'organization-a', name: 'Acme' },
     mothershipAvailable: true,
     canBuild: true,
     searchAccess: { memberScoped: false },
@@ -642,3 +651,22 @@ it('keeps the latest submitted Search query when the next turn is switched to Bu
     undefined
   )
 })
+
+it('fills the Build draft from suggested actions without sending', async () => {
+  await act(async () => renderHome(<OrganizationHome userName='Ada Lovelace' />))
+  expect(container.querySelector('h1')?.textContent).toBe('What should we get done, Ada?')
+  const suggestion = [...container.querySelectorAll('button')].find(
+    (button) => button.textContent === 'Suggested actions'
+  )!
+  await act(async () => suggestion.click())
+  expect(composerProps().value).toBe('Create a CRM with sample data.')
+  expect(mocks.send).not.toHaveBeenCalled()
+})
+
+it('shows staging Search heading and setup steps instead of Build suggestions', async () => {
+  await act(async () => renderHome(<OrganizationHome />))
+  await act(async () => composerProps().onModeChange?.('assistant'))
+  expect(container.querySelector('h1')?.textContent).toBe('Search Acme')
+  expect(container.textContent).toContain('Get started')
+  expect(container.textContent).not.toContain('Suggested actions')
+})
@@ -16,6 +16,7 @@ import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organ
 import { ChatResourcePanel } from '@/app/workspace/[workspaceId]/home/components/chat-resource-panel'
 import { SearchIntegrationConnection } from '@/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/search-integration-connection'
 import { MothershipChat } from '@/app/workspace/[workspaceId]/home/components/mothership-chat'
+import { SuggestedActions } from '@/app/workspace/[workspaceId]/home/components/suggested-actions'
 import { useChat } from '@/app/workspace/[workspaceId]/home/hooks/use-chat'
 import {
   useChatResourcePanel,
@@ -28,6 +29,7 @@ import type {
   WorkspaceResourceRef,
 } from '@/app/workspace/[workspaceId]/home/types'
 import { useFileAttachments } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-file-attachments'
+import { mentionifyIntegrations } from '@/blocks/integration-matcher'
 import { useMarkMothershipChatRead } from '@/hooks/queries/mothership-chats'
 import { getWorkspaceFilesQueryOptions } from '@/hooks/queries/workspace-files'
 import { useOrganizationChatModeStore } from '@/stores/organization-chat-mode/store'
@@ -267,13 +269,22 @@ function OrganizationHomeContent({
           {/* Asymmetric padding biases the group up so the full cluster (heading + input + steps) sits at the optical center */}
           <div className='flex min-h-full flex-col items-center justify-center px-6 pt-[2vh] pb-[22vh]'>
             <h1 className='mb-7 max-w-chat text-balance font-season text-[26px] text-[var(--text-primary)] leading-[1.15] tracking-[-0.01em] sm:text-[28px]'>
-              What should we get done{firstName ? `, ${firstName}` : ''}?
+              {requestMode === 'assistant'
+                ? `Search ${organization.name}`
+                : `What should we get done${firstName ? `, ${firstName}` : ''}?`}
             </h1>
             <div className='relative w-full max-w-chat'>
               {composer}
               {/* Anchored out of flow so expanding/collapsing never shifts the centered input */}
               <div className='absolute inset-x-0 top-full'>
-                {searchAccess.memberScoped && <GetStarted />}
+                {requestMode === 'agent' ? (
+                  <SuggestedActions
+                    organizationId={organization.id}
+                    onSelectPrompt={(prompt) => setDraft(mentionifyIntegrations(prompt))}
+                  />
+                ) : searchAccess.memberScoped ? (
+                  <GetStarted />
+                ) : null}
               </div>
             </div>
           </div>
 
@@ -5,8 +5,9 @@ import { act } from 'react'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
-const { mockCaptureEvent } = vi.hoisted(() => ({
+const { mockCaptureEvent, mockCredentials } = vi.hoisted(() => ({
   mockCaptureEvent: vi.fn(),
+  mockCredentials: vi.fn(() => ({ data: [] })),
 }))
 
 vi.mock('next/navigation', () => ({
@@ -17,7 +18,7 @@ vi.mock('@/lib/posthog/client', () => ({ captureEvent: mockCaptureEvent }))
 vi.mock('@sim/utils/random', () => ({ randomFloat: () => 0 }))
 
 vi.mock('@/hooks/queries/credentials', () => ({
-  useWorkspaceCredentials: () => ({ data: [] }),
+  useWorkspaceCredentials: mockCredentials,
 }))
 vi.mock('@/hooks/queries/oauth/oauth-connections', () => ({
   useOAuthConnections: () => ({ data: [] }),
@@ -42,12 +43,16 @@ let root: Root | null = null
 let container: HTMLDivElement | null = null
 const onSelectPrompt = vi.fn()
 
-function mount() {
+function mount(organizationId?: string) {
   ;(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true
   container = document.createElement('div')
   document.body.appendChild(container)
   root = createRoot(container)
-  act(() => root?.render(<SuggestedActions onSelectPrompt={onSelectPrompt} />))
+  act(() =>
+    root?.render(
+      <SuggestedActions organizationId={organizationId} onSelectPrompt={onSelectPrompt} />
+    )
+  )
 }
 
 function heading(): string {
@@ -63,6 +68,7 @@ function rows(): HTMLButtonElement[] {
 beforeEach(() => {
   onSelectPrompt.mockClear()
   mockCaptureEvent.mockClear()
+  mockCredentials.mockClear()
 })
 
 afterEach(() => {
@@ -88,3 +94,26 @@ describe('SuggestedActions', () => {
     expect(onSelectPrompt).toHaveBeenCalledWith('Create a CRM with sample data.')
   })
 })
+
+it('uses org integration suggestions as prompts without opening workspace OAuth', () => {
+  mount('organization-1')
+  act(() =>
+    rows()
+      .find((row) => row.textContent === 'Integrate with Slack')
+      ?.click()
+  )
+  expect(onSelectPrompt).toHaveBeenCalledWith('Integrate with Slack.')
+  expect(container?.querySelector('[data-testid="connect-modal"]')).toBeNull()
+  expect(mockCredentials).toHaveBeenCalledWith({ workspaceId: undefined, enabled: false })
+})
+
+it('keeps workspace integration suggestions connected to their OAuth flow', () => {
+  mount()
+  act(() =>
+    rows()
+      .find((row) => row.textContent === 'Integrate with Slack')
+      ?.click()
+  )
+  expect(container?.querySelector('[data-testid="connect-modal"]')).not.toBeNull()
+  expect(onSelectPrompt).not.toHaveBeenCalled()
+})