diff --git a/packages/web-ui/src/App.tsx b/packages/web-ui/src/App.tsx
index 0e2653ec..62da540a 100644
--- a/packages/web-ui/src/App.tsx
+++ b/packages/web-ui/src/App.tsx
@@ -24,7 +24,7 @@ import { useTheme } from './hooks/useTheme.ts';
 import { useIsMobile } from './hooks/useIsMobile.ts';
 import { prefetch, PREFETCH_KEYS } from './prefetchCache.ts';
 import { useTranslation } from 'react-i18next';
-import { SearchModal } from './components/SearchModal.tsx';
+import { SearchModal, type SearchCategory } from './components/SearchModal.tsx';
 
 const HIDDEN_STYLE: React.CSSProperties = {
   visibility: 'hidden',
@@ -110,6 +110,7 @@ export function App() {
   }, [checkLicenseLimits]);
 
   const [showSearchModal, setShowSearchModal] = useState(false);
+  const [searchInitialTab, setSearchInitialTab] = useState<SearchCategory>();
 
   // Global search shortcut: Cmd+P (Mac) / Ctrl+P (Win/Linux)
   useEffect(() => {
@@ -118,16 +119,22 @@ export function App() {
     const onKey = (e: KeyboardEvent) => {
       if (isMac && e.metaKey && !e.ctrlKey && e.key === 'p') {
         e.preventDefault();
+        setSearchInitialTab(undefined);
         setShowSearchModal(prev => !prev);
       } else if (!isMac && e.ctrlKey && !e.metaKey && e.key === 'p') {
         e.preventDefault();
+        setSearchInitialTab(undefined);
         setShowSearchModal(prev => !prev);
       }
     };
-    const onOpen = () => setShowSearchModal(true);
+    const onOpen = (e: Event) => {
+      const detail = (e as CustomEvent).detail;
+      setSearchInitialTab(detail?.initialTab);
+      setShowSearchModal(true);
+    };
     document.addEventListener('keydown', onKey);
-    window.addEventListener('markus:open-search', onOpen);
-    return () => { document.removeEventListener('keydown', onKey); window.removeEventListener('markus:open-search', onOpen); };
+    window.addEventListener('markus:open-search', onOpen as EventListener);
+    return () => { document.removeEventListener('keydown', onKey); window.removeEventListener('markus:open-search', onOpen as EventListener); };
   }, [isMobile]);
 
   const navigate = useCallback((p: PageId) => {
@@ -449,7 +456,7 @@ export function App() {
 
       {/* Global search modal (desktop) */}
       {!isMobile && showSearchModal && (
-        <SearchModal onClose={() => setShowSearchModal(false)} currentPage={page} />
+        <SearchModal onClose={() => { setShowSearchModal(false); setSearchInitialTab(undefined); }} currentPage={page} initialTab={searchInitialTab} />
       )}
     </div>
   );
diff --git a/packages/web-ui/src/api.ts b/packages/web-ui/src/api.ts
index b91b9fbd..17b1ef99 100644
--- a/packages/web-ui/src/api.ts
+++ b/packages/web-ui/src/api.ts
@@ -89,11 +89,19 @@ export interface SearchResult {
   source: 'channel' | 'direct';
   id: string;
   text: string;
+  /** Text snippet from FTS5 with <mark> tags for highlight rendering */
+  snippetText?: string;
   senderName?: string;
+  senderId?: string;
   channel?: string;
   sessionId?: string;
+  sessionName?: string;
   agentId?: string;
   createdAt: string;
+  /** Number of matches in this message (from FTS5) */
+  matchCount?: number;
+  /** FTS5 relevance score */
+  relevanceScore?: number;
 }
 
 
@@ -1679,12 +1687,26 @@ export const api = {
 
   // ─── Message Search ───────────────────────────────────────────────
   messages: {
-    search: (query: string, opts?: { scope?: 'all' | 'channel' | 'direct'; channel?: string; limit?: number }) => {
+    search: (query: string, opts?: {
+      scope?: 'all' | 'channel' | 'direct';
+      channel?: string;
+      agentId?: string;
+      sessionId?: string;
+      limit?: number;
+      offset?: number;
+      from?: string;
+      to?: string;
+    }) => {
       const params = new URLSearchParams({ q: query });
       if (opts?.scope) params.set('scope', opts.scope);
       if (opts?.channel) params.set('channel', opts.channel);
+      if (opts?.agentId) params.set('agentId', opts.agentId);
+      if (opts?.sessionId) params.set('sessionId', opts.sessionId);
       if (opts?.limit) params.set('limit', String(opts.limit));
-      return request<{ results: SearchResult[] }>(`/messages/search?${params}`);
+      if (opts?.offset) params.set('offset', String(opts.offset));
+      if (opts?.from) params.set('from', opts.from);
+      if (opts?.to) params.set('to', opts.to);
+      return request<{ results: SearchResult[]; total?: number; speedMs?: number }>(`/messages/search?${params}`);
     },
   },
 
diff --git a/packages/web-ui/src/components/ChatPanel.tsx b/packages/web-ui/src/components/ChatPanel.tsx
index d2bd1e25..15839674 100644
--- a/packages/web-ui/src/components/ChatPanel.tsx
+++ b/packages/web-ui/src/components/ChatPanel.tsx
@@ -505,6 +505,13 @@ export function ChatPanel({
           className="rounded-md"
         />
         <span className="text-sm font-medium text-fg-primary truncate flex-1">{agentName}</span>
+        <button
+          onClick={() => window.dispatchEvent(new CustomEvent('markus:open-search', { detail: { initialTab: 'messages' } }))}
+          className={`p-1 rounded-md transition-colors text-fg-tertiary hover:text-fg-secondary`}
+          title={t('page.searchMessages')}
+        >
+          <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth={2}><path strokeLinecap="round" strokeLinejoin="round" d="M21 21l-5.197-5.197m0 0A7.5 7.5 0 105.196 5.196a7.5 7.5 0 0010.607 10.607z" /></svg>
+        </button>
         {onClose && (
           <button onClick={onClose} className="text-fg-tertiary hover:text-fg-secondary transition-colors p-1">
             <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
diff --git a/packages/web-ui/src/components/SearchModal.tsx b/packages/web-ui/src/components/SearchModal.tsx
index a159ff55..8ee02afc 100644
--- a/packages/web-ui/src/components/SearchModal.tsx
+++ b/packages/web-ui/src/components/SearchModal.tsx
@@ -1,11 +1,12 @@
 import { useState, useCallback, useRef, useEffect, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { api, type AgentInfo, type TaskInfo, type ProjectInfo, type DeliverableInfo, type RequirementInfo, type WorkflowInfo } from '../api.ts';
+import { api, type AgentInfo, type TaskInfo, type ProjectInfo, type DeliverableInfo, type RequirementInfo, type WorkflowInfo, type SearchResult } from '../api.ts';
 import { navBus } from '../navBus.ts';
 import { PAGE, type PageId } from '../routes.ts';
 import { Avatar } from './Avatar.tsx';
 
-type SearchCategory = 'all' | 'agents' | 'tasks' | 'requirements' | 'projects' | 'deliverables' | 'workflows';
+export type SearchCategory = 'all' | 'agents' | 'tasks' | 'requirements' | 'projects' | 'deliverables' | 'workflows' | 'messages';
+type SearchScope = 'all' | 'channel' | 'direct';
 
 interface SearchResults {
   agents: AgentInfo[];
@@ -18,7 +19,7 @@ interface SearchResults {
 
 interface FlatItem {
   id: string;
-  type: 'agent' | 'task' | 'requirement' | 'project' | 'deliverable' | 'workflow' | 'showMore';
+  type: 'agent' | 'task' | 'requirement' | 'project' | 'deliverable' | 'workflow' | 'message' | 'showMore';
   page: PageId;
   params?: Record<string, string>;
   expandCategory?: SearchCategory;
@@ -41,15 +42,26 @@ let _persistedCategory: SearchCategory = 'all';
 let _persistedResults: SearchResults = EMPTY;
 let _persistedSearched = false;
 
-export function SearchModal({ onClose, currentPage }: { onClose: () => void; currentPage?: string }) {
+export function SearchModal({ onClose, currentPage, initialTab }: { onClose: () => void; currentPage?: string; initialTab?: SearchCategory }) {
   const { t } = useTranslation(['common', 'home', 'work']);
+  const initialCategory = initialTab && initialTab !== 'all' ? initialTab : _persistedCategory;
   const [query, setQuery] = useState(_persistedQuery);
-  const [category, setCategory] = useState<SearchCategory>(_persistedCategory);
+  const [category, setCategory] = useState<SearchCategory>(initialCategory);
   const [results, setResults] = useState<SearchResults>(_persistedResults);
   const [loading, setLoading] = useState(false);
   const [searched, setSearched] = useState(_persistedSearched);
   const [focusIdx, setFocusIdx] = useState(-1);
 
+  // Message search state
+  const [messageResults, setMessageResults] = useState<SearchResult[]>([]);
+  const [messageLoading, setMessageLoading] = useState(false);
+  const [messageTotal, setMessageTotal] = useState(0);
+  const [messageError, setMessageError] = useState<string | null>(null);
+  const [messageScope, setMessageScope] = useState<SearchScope>('all');
+
+  const messageAbortRef = useRef<AbortController | null>(null);
+  const messageDebounceRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
+
   useEffect(() => { _persistedQuery = query; }, [query]);
   useEffect(() => { _persistedCategory = category; }, [category]);
   useEffect(() => { _persistedResults = results; }, [results]);
@@ -63,6 +75,47 @@ export function SearchModal({ onClose, currentPage }: { onClose: () => void; cur
     setTimeout(() => { inputRef.current?.focus(); inputRef.current?.select(); }, 100);
   }, []);
 
+  // ─── Messages search ───────────────────────────────────────────────
+  const doMessageSearch = useCallback(async (q: string, scope: SearchScope, channel?: string, agentId?: string) => {
+    if (!q.trim() || q.length < 2) {
+      setMessageResults([]);
+      setMessageTotal(0);
+      setMessageLoading(false);
+      return;
+    }
+    messageAbortRef.current?.abort();
+    const controller = new AbortController();
+    messageAbortRef.current = controller;
+    setMessageLoading(true);
+    setMessageError(null);
+    try {
+      const response = await api.messages.search(q, { scope, channel, agentId, limit: 30 });
+      if (controller.signal.aborted) return;
+      setMessageResults(response.results ?? []);
+      setMessageTotal(response.total ?? response.results?.length ?? 0);
+    } catch (err: unknown) {
+      if (controller.signal.aborted) return;
+      setMessageResults([]);
+      setMessageTotal(0);
+      setMessageError(err instanceof Error ? err.message : 'Search failed');
+    } finally {
+      if (!controller.signal.aborted) setMessageLoading(false);
+    }
+  }, []);
+
+  const handleMessageInput = useCallback((q: string) => {
+    if (messageDebounceRef.current) clearTimeout(messageDebounceRef.current);
+    messageDebounceRef.current = setTimeout(() => doMessageSearch(q, messageScope), 300);
+  }, [doMessageSearch, messageScope]);
+
+  const handleMessageScopeChange = useCallback((scope: SearchScope) => {
+    setMessageScope(scope);
+    if (query.trim().length >= 2) {
+      doMessageSearch(query, scope);
+    }
+  }, [query, doMessageSearch]);
+
+  // ─── Entity search ─────────────────────────────────────────────────
   const doSearch = useCallback(async (q: string) => {
     if (!q.trim()) { setResults(EMPTY); setSearched(false); setFocusIdx(-1); return; }
     setLoading(true);
@@ -114,6 +167,10 @@ export function SearchModal({ onClose, currentPage }: { onClose: () => void; cur
 
   const handleInput = (value: string) => {
     setQuery(value);
+    if (category === 'messages') {
+      handleMessageInput(value);
+      return;
+    }
     if (debounceRef.current) clearTimeout(debounceRef.current);
     debounceRef.current = setTimeout(() => doSearch(value), 400);
   };
@@ -131,6 +188,7 @@ export function SearchModal({ onClose, currentPage }: { onClose: () => void; cur
     { id: 'projects', label: t('common:projects', { defaultValue: '项目' }) },
     { id: 'deliverables', label: t('common:deliverables', { defaultValue: '交付物' }) },
     { id: 'workflows', label: t('common:workflows', { defaultValue: '工作流' }) },
+    { id: 'messages', label: t('common:chatMessages', { defaultValue: '对话' }) },
   ];
 
   const sectionOrder = useMemo(() => PAGE_SECTION_ORDER[currentPage || ''] || DEFAULT_ORDER, [currentPage]);
@@ -267,20 +325,130 @@ export function SearchModal({ onClose, currentPage }: { onClose: () => void; cur
 
         {/* Results */}
         <div ref={listRef} className="flex-1 overflow-y-auto px-5 py-3">
-          {loading && (
+          {/* ── Messages tab ───────────────────────────────────── */}
+          {category === 'messages' && (
+            <>
+              {/* Scope filter (only visible in messages tab) */}
+              <div className="flex items-center gap-2 mb-3">
+                <span className="text-[11px] text-fg-tertiary shrink-0">{t('page.searchScope', { defaultValue: '范围' })}:</span>
+                {(['all', 'channel', 'direct'] as const).map(s => (
+                  <button
+                    key={s}
+                    onClick={() => handleMessageScopeChange(s)}
+                    className={`px-2 py-1 rounded text-[10px] font-medium transition-colors ${
+                      messageScope === s
+                        ? 'bg-brand-500/15 text-brand-500 ring-1 ring-brand-500/30'
+                        : 'text-fg-tertiary hover:text-fg-secondary hover:bg-surface-elevated'
+                    }`}
+                  >
+                    {s === 'all' ? (t('page.searchAll', { defaultValue: '全部' })) :
+                     s === 'channel' ? (t('page.searchChannel', { defaultValue: '频道' })) :
+                     (t('page.searchDirect', { defaultValue: '私聊' }))}
+                  </button>
+                ))}
+              </div>
+
+              {/* Loading */}
+              {messageLoading && (
+                <div className="flex items-center justify-center py-8">
+                  <div className="text-fg-tertiary text-sm animate-pulse">{t('common:loading')}</div>
+                </div>
+              )}
+
+              {/* Results */}
+              {!messageLoading && messageResults.length > 0 && (
+                <div className="space-y-1">
+                  <div className="flex items-center justify-between px-1 py-1 text-[10px] text-fg-tertiary/60">
+                    <span>{messageTotal > 0 ? `${messageTotal} ${t('common:results', { defaultValue: '个结果' })}` : ''}</span>
+                  </div>
+                  {messageResults.map((r) => {
+                    const idx = itemCounter++;
+                    const displayText = r.snippetText ?? r.text;
+                    return (
+                      <button
+                        key={r.id}
+                        data-idx={idx}
+                        onClick={() => {
+                          onClose();
+                          // Navigate: for channel messages go to team with channel, for direct go to agent
+                          if (r.source === 'channel' && r.channel) {
+                            navBus.navigate(PAGE.TEAM, { channelId: r.channel });
+                          } else if (r.source === 'direct' && r.agentId) {
+                            navBus.navigate(PAGE.TEAM, { agentId: r.agentId });
+                          }
+                        }}
+                        className={`w-full text-left p-3 rounded-xl transition-colors ${idx === focusIdx ? 'bg-brand-600/15 ring-1 ring-brand-500/40' : 'hover:bg-surface-overlay'}`}
+                      >
+                        {/* Meta row */}
+                        <div className="flex items-center gap-2 text-[11px] text-fg-tertiary mb-1">
+                          <span className={`px-1.5 py-0.5 rounded text-[10px] font-medium ${
+                            r.source === 'channel' ? 'bg-blue-500/10 text-blue-500' : 'bg-emerald-500/10 text-emerald-500'
+                          }`}>
+                            {r.source === 'channel' ? '#' : '1:1'}
+                          </span>
+                          {r.senderName && <span className="truncate max-w-[120px]">{r.senderName}</span>}
+                          {r.sessionName && <span className="truncate text-fg-tertiary/70">· {r.sessionName}</span>}
+                        </div>
+                        {/* Content with highlights */}
+                        <div className="text-xs text-fg-secondary line-clamp-2 leading-relaxed">
+                          {renderMessageHighlight(displayText, query)}
+                        </div>
+                        {/* Match count */}
+                        {r.matchCount !== undefined && r.matchCount > 1 && (
+                          <div className="mt-1 text-[10px] text-fg-tertiary/60">{r.matchCount} {t('common:matches', { defaultValue: '个匹配' })}</div>
+                        )}
+                      </button>
+                    );
+                  })}
+                </div>
+              )}
+
+              {/* Empty */}
+              {!messageLoading && query.length >= 2 && messageResults.length === 0 && !messageError && (
+                <div className="flex flex-col items-center justify-center py-8 text-center">
+                  <svg width="36" height="36" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.5" className="text-fg-tertiary mb-2"><circle cx="11" cy="11" r="8" /><line x1="21" y1="21" x2="16.65" y2="16.65" /></svg>
+                  <p className="text-sm text-fg-tertiary">{t('common:noResults', { defaultValue: '没有找到相关结果' })}</p>
+                </div>
+              )}
+
+              {/* Error */}
+              {messageError && (
+                <div className="flex flex-col items-center justify-center py-6 text-center">
+                  <p className="text-sm text-red-500">{messageError}</p>
+                  <button
+                    onClick={() => doMessageSearch(query, messageScope)}
+                    className="text-xs text-brand-500 hover:text-brand-400 mt-1"
+                  >
+                    {t('common:retry', { defaultValue: '重试' })}
+                  </button>
+                </div>
+              )}
+
+              {/* Initial state */}
+              {!messageLoading && query.length < 2 && (
+                <div className="flex flex-col items-center justify-center py-8 text-center">
+                  <svg width="36" height="36" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.5" className="text-fg-tertiary mb-2"><circle cx="11" cy="11" r="8" /><line x1="21" y1="21" x2="16.65" y2="16.65" /></svg>
+                  <p className="text-sm text-fg-tertiary">{t('common:searchHint', { defaultValue: '输入关键词搜索对话内容' })}</p>
+                </div>
+              )}
+            </>
+          )}
+
+          {/* ── Entity tabs (non-messages) ──────────────────────── */}
+          {category !== 'messages' && loading && (
             <div className="flex items-center justify-center py-8">
               <div className="text-fg-tertiary text-sm animate-pulse">{t('common:loading')}</div>
             </div>
           )}
 
-          {!loading && searched && !hasResults && (
+          {category !== 'messages' && !loading && searched && !hasResults && (
             <div className="flex flex-col items-center justify-center py-8 text-center">
               <svg width="36" height="36" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.5" className="text-fg-tertiary mb-2"><circle cx="11" cy="11" r="8" /><line x1="21" y1="21" x2="16.65" y2="16.65" /></svg>
               <p className="text-sm text-fg-tertiary">{t('common:noResults', { defaultValue: '没有找到相关结果' })}</p>
             </div>
           )}
 
-          {!loading && hasResults && (
+          {category !== 'messages' && !loading && hasResults && (
             <div className="space-y-4">
               {sectionOrder.map(section => {
                 if (category !== 'all' && category !== section) return null;
@@ -438,7 +606,7 @@ export function SearchModal({ onClose, currentPage }: { onClose: () => void; cur
             </div>
           )}
 
-          {!loading && !searched && (
+          {category !== 'messages' && !loading && !searched && (
             <div className="flex flex-col items-center justify-center py-8 text-center">
               <svg width="36" height="36" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.5" className="text-fg-tertiary mb-2"><circle cx="11" cy="11" r="8" /><line x1="21" y1="21" x2="16.65" y2="16.65" /></svg>
               <p className="text-sm text-fg-tertiary">{t('common:searchHint', { defaultValue: '输入关键词搜索' })}</p>
@@ -459,6 +627,39 @@ export function SearchModal({ onClose, currentPage }: { onClose: () => void; cur
   );
 }
 
+/**
+ * Render text with <mark> tags from FTS5 snippet, or fallback to case-insensitive highlight.
+ */
+function renderMessageHighlight(text: string, query: string): React.ReactNode {
+  if (text.includes('<mark>')) {
+    const parts: React.ReactNode[] = [];
+    const regex = /<mark>(.*?)<\/mark>|([^<]+(?!<\/mark>))|<[^>]+>/g;
+    let match: RegExpExecArray | null;
+    let lastIndex = 0;
+    let key = 0;
+    while ((match = regex.exec(text)) !== null) {
+      if (match[1] !== undefined) {
+        parts.push(<mark key={key++} className="bg-amber-400/20 text-amber-400 rounded-sm px-0.5">{match[1]}</mark>);
+      } else if (match[0]) {
+        parts.push(<span key={key++}>{match[0]}</span>);
+      }
+      lastIndex = match.index + match[0].length;
+    }
+    if (lastIndex < text.length) parts.push(<span key={key++}>{text.slice(lastIndex)}</span>);
+    return parts.length > 0 ? parts : text;
+  }
+  if (!query || query.length < 2) return text;
+  const escaped = query.replace(/[.*+?^${}()|[\]\\]/g, '\\function StatusDot({ status }: { status: string }) {');
+  const regex = new RegExp(`(${escaped})`, 'gi');
+  const parts = text.split(regex);
+  if (parts.length === 1) return text;
+  return parts.map((part, i) =>
+    regex.test(part)
+      ? <mark key={i} className="bg-amber-400/20 text-amber-400 rounded-sm px-0.5">{part}</mark>
+      : part
+  );
+}
+
 function StatusDot({ status }: { status: string }) {
   const color = status === 'active' || status === 'idle' ? 'bg-green-500'
     : status === 'working' || status === 'busy' ? 'bg-blue-500'
diff --git a/packages/web-ui/src/pages/Team.tsx b/packages/web-ui/src/pages/Team.tsx
index faf77d26..d265f6d9 100644
--- a/packages/web-ui/src/pages/Team.tsx
+++ b/packages/web-ui/src/pages/Team.tsx
@@ -449,13 +449,6 @@ export function TeamPage({ initialAgentId, authUser, previewMode, previewData }:
   const pendingSelectTeamRef = useRef<string | null>(null);
   const [showMemberPanel, setShowMemberPanel] = useState(false);
 
-  // Message search
-  const [searchOpen, setSearchOpen] = useState(false);
-  const [searchQuery, setSearchQuery] = useState('');
-  const [searchResults, setSearchResults] = useState<import('../api.ts').SearchResult[]>([]);
-  const [searchLoading, setSearchLoading] = useState(false);
-  const searchDebounceRef = useRef<ReturnType<typeof setTimeout>>(undefined);
-
   // Teams
   const [teams, setTeams] = useState<TeamInfo[]>(previewData?.teams ?? []);
 
@@ -2346,45 +2339,6 @@ export function TeamPage({ initialAgentId, authUser, previewMode, previewData }:
     }
   };
 
-  const executeSearch = useCallback(async (q: string) => {
-    if (q.length < 2) { setSearchResults([]); return; }
-    setSearchLoading(true);
-    try {
-      const scope = chatMode === 'channel' ? 'channel' : chatMode === 'direct' ? 'direct' : 'all';
-      const channel = chatMode === 'channel' ? activeChannel : undefined;
-      const { results } = await api.messages.search(q, { scope, channel, limit: 30 });
-      setSearchResults(results);
-    } catch { setSearchResults([]); }
-    setSearchLoading(false);
-  }, [chatMode, activeChannel]);
-
-  const handleSearchInput = useCallback((q: string) => {
-    setSearchQuery(q);
-    if (searchDebounceRef.current) clearTimeout(searchDebounceRef.current);
-    searchDebounceRef.current = setTimeout(() => executeSearch(q), 300);
-  }, [executeSearch]);
-
-  const handleSearchResultClick = useCallback((result: import('../api.ts').SearchResult) => {
-    setSearchOpen(false);
-    setSearchQuery('');
-    setSearchResults([]);
-    if (result.source === 'channel' && result.channel) {
-      setChatMode('channel');
-      setActiveChannel(result.channel);
-    } else if (result.source === 'direct' && result.agentId) {
-      setChatMode('direct');
-      setSelectedAgent(result.agentId);
-    }
-    setTimeout(() => {
-      const el = document.getElementById(`msg-${result.id}`);
-      if (el) {
-        el.scrollIntoView({ behavior: 'smooth', block: 'center' });
-        el.classList.add('bg-brand-500/10');
-        setTimeout(() => el.classList.remove('bg-brand-500/10'), 2000);
-      }
-    }, 500);
-  }, []);
-
   const newConversation = () => {
     setActiveSessionId(NEW_CHAT_PLACEHOLDER_ID);
     const key = currentConvKeyRef.current;
@@ -2825,8 +2779,8 @@ export function TeamPage({ initialAgentId, authUser, previewMode, previewData }:
                 >{chatMode === 'channel' ? t('page.teamTab') : t('page.profileTab')}</button>
                 <div className="flex-1" />
                 <button
-                  onClick={() => { setSearchOpen(!searchOpen); if (!searchOpen) { setSearchQuery(''); setSearchResults([]); } }}
-                  className={`p-1 rounded-md transition-colors shrink-0 ${searchOpen ? 'bg-brand-500/15 text-brand-500' : 'text-fg-tertiary'}`}
+                  onClick={() => { window.dispatchEvent(new CustomEvent('markus:open-search', { detail: { initialTab: 'messages' } })); }}
+                  className="p-1 rounded-md transition-colors shrink-0 text-fg-tertiary"
                 >
                   <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth={2}><path strokeLinecap="round" strokeLinejoin="round" d="M21 21l-5.197-5.197m0 0A7.5 7.5 0 105.196 5.196a7.5 7.5 0 0010.607 10.607z" /></svg>
                 </button>
@@ -3012,8 +2966,8 @@ export function TeamPage({ initialAgentId, authUser, previewMode, previewData }:
                 {/* Right side buttons */}
                 <div className="ml-auto flex items-center gap-2 shrink-0">
                   <button
-                    onClick={() => { setSearchOpen(!searchOpen); if (!searchOpen) { setSearchQuery(''); setSearchResults([]); } }}
-                    className={`p-1.5 rounded-md transition-colors ${searchOpen ? 'bg-brand-500/15 text-brand-500' : 'text-fg-tertiary hover:text-fg-secondary hover:bg-surface-elevated'}`}
+                    onClick={() => { window.dispatchEvent(new CustomEvent('markus:open-search', { detail: { initialTab: 'messages' } })); }}
+                    className="p-1.5 rounded-md transition-colors text-fg-tertiary hover:text-fg-secondary hover:bg-surface-elevated"
                     title={t('page.searchMessages')}
                   >
                     <svg className="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={1.5}>
@@ -3080,62 +3034,6 @@ export function TeamPage({ initialAgentId, authUser, previewMode, previewData }:
           })()
           )}
 
-          {/* Search panel */}
-          {searchOpen && (
-            <div className="border-b border-border-default bg-surface-secondary/50 px-4 py-2 space-y-2 animate-in slide-in-from-top-2 duration-200">
-              <div className="flex items-center gap-2">
-                <div className="flex-1 relative">
-                  <svg className="absolute left-2.5 top-1/2 -translate-y-1/2 w-3.5 h-3.5 text-fg-tertiary" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}>
-                    <path strokeLinecap="round" strokeLinejoin="round" d="M21 21l-5.197-5.197m0 0A7.5 7.5 0 105.196 5.196a7.5 7.5 0 0010.607 10.607z" />
-                  </svg>
-                  <input
-                    autoFocus
-                    value={searchQuery}
-                    onChange={e => handleSearchInput(e.target.value)}
-                    onKeyDown={e => { if (e.key === 'Escape') { setSearchOpen(false); setSearchQuery(''); setSearchResults([]); } }}
-                    placeholder={t('page.searchPlaceholder')}
-                    className="w-full pl-8 pr-3 py-1.5 text-xs bg-surface-primary border border-border-default rounded-lg outline-none focus:border-brand-500/50 transition-colors"
-                  />
-                </div>
-                <button
-                  onClick={() => { setSearchOpen(false); setSearchQuery(''); setSearchResults([]); }}
-                  className="text-fg-tertiary hover:text-fg-secondary text-xs px-1"
-                >✕</button>
-              </div>
-              {searchLoading && (
-                <div className="flex items-center gap-2 text-xs text-fg-tertiary py-1">
-                  <svg className="animate-spin h-3 w-3" viewBox="0 0 24 24" fill="none"><circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4" /><path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4z" /></svg>
-                  {t('page.searching')}
-                </div>
-              )}
-              {!searchLoading && searchQuery.length >= 2 && searchResults.length === 0 && (
-                <div className="text-xs text-fg-tertiary py-1">{t('page.noSearchResults')}</div>
-              )}
-              {searchResults.length > 0 && (
-                <div className="max-h-60 overflow-y-auto space-y-0.5">
-                  {searchResults.map(r => (
-                    <button
-                      key={r.id}
-                      onClick={() => handleSearchResultClick(r)}
-                      className="w-full text-left px-3 py-2 rounded-lg hover:bg-surface-elevated transition-colors group"
-                    >
-                      <div className="flex items-center gap-2 text-[11px] text-fg-tertiary mb-0.5">
-                        <span className={`px-1.5 py-0.5 rounded text-[10px] font-medium ${r.source === 'channel' ? 'bg-blue-500/10 text-blue-500' : 'bg-emerald-500/10 text-emerald-500'}`}>
-                          {r.source === 'channel' ? '#' : '1:1'}
-                        </span>
-                        {r.senderName && <span>{r.senderName}</span>}
-                        <span>{new Date(r.createdAt).toLocaleDateString(undefined, { month: 'short', day: 'numeric' })}</span>
-                      </div>
-                      <div className="text-xs text-fg-secondary line-clamp-2 group-hover:text-fg-primary transition-colors">
-                        {r.text.length > 200 ? r.text.slice(0, 200) + '…' : r.text}
-                      </div>
-                    </button>
-                  ))}
-                </div>
-              )}
-            </div>
-          )}
-
           {/* Session tab bar (direct mode, chat tab) — hide when only 1 session */}
           {chatMode === 'direct' && selectedAgent && mainTab === 'chat' && openSessionTabs.length > 1 && (
             <div className="flex items-center gap-0 px-3 overflow-x-auto scrollbar-hide">