diff --git a/apps/web_v1/scripts/api-client.test.mjs b/apps/web_v1/scripts/api-client.test.mjs index 226ac3e..223fdde 100644 --- a/apps/web_v1/scripts/api-client.test.mjs +++ b/apps/web_v1/scripts/api-client.test.mjs @@ -125,6 +125,19 @@ test('FormData body leaves Content-Type unset so fetch provides the boundary', a assert.equal(requestInit.headers['Content-Type'], undefined) }) +test('request forwards its AbortSignal to fetch', async () => { + let requestInit + const controller = new AbortController() + globalThis.fetch = async (_url, init) => { + requestInit = init + return Response.json({ ok: true }) + } + + await apiRequest('/search', { signal: controller.signal }) + + assert.equal(requestInit.signal, controller.signal) +}) + test('base URL normalizer trims whitespace and all trailing slashes', () => { assert.equal(normalizeBaseUrl(' https://host.example/// '), 'https://host.example') }) diff --git a/apps/web_v1/scripts/search-request-gate.test.mjs b/apps/web_v1/scripts/search-request-gate.test.mjs new file mode 100644 index 0000000..46f9a0b --- /dev/null +++ b/apps/web_v1/scripts/search-request-gate.test.mjs @@ -0,0 +1,41 @@ +import assert from 'node:assert/strict' +import test from 'node:test' +import { createSearchRequestGate } from '../src/app/search-request-gate.ts' + +test('starting a new request aborts and invalidates the previous request', () => { + const gate = createSearchRequestGate() + const first = gate.begin() + const second = gate.begin() + + assert.equal(first.signal.aborted, true) + assert.equal(first.isCurrent(), false) + assert.equal(second.signal.aborted, false) + assert.equal(second.isCurrent(), true) +}) + +test('session cleanup aborts the request and suppresses its stale error', async () => { + const gate = createSearchRequestGate() + const request = gate.begin() + const surfacedErrors = [] + const oldSessionFailure = Promise.reject(new Error('旧会话搜索失败')).catch((error) => { + if (request.isCurrent()) surfacedErrors.push(error.message) + }) + + gate.invalidate() + await oldSessionFailure + + assert.equal(request.signal.aborted, true) + assert.equal(request.isCurrent(), false) + assert.deepEqual(surfacedErrors, []) +}) + +test('a request after invalidation belongs to the new session generation', () => { + const gate = createSearchRequestGate() + const oldSessionRequest = gate.begin() + gate.invalidate() + const newSessionRequest = gate.begin() + + assert.equal(oldSessionRequest.isCurrent(), false) + assert.equal(newSessionRequest.isCurrent(), true) + assert.equal(newSessionRequest.signal.aborted, false) +}) diff --git a/apps/web_v1/scripts/visual-check.mjs b/apps/web_v1/scripts/visual-check.mjs index 4d37199..2cffe54 100644 --- a/apps/web_v1/scripts/visual-check.mjs +++ b/apps/web_v1/scripts/visual-check.mjs @@ -21,7 +21,11 @@ const failures = [] const projectId = '019b0000-0000-7000-8000-000000000001' const taskSearchResultId = '019b0000-0000-7000-8000-000000000003' const unknownProjectId = '019b0000-0000-7000-8000-000000000099' +const externalProjectId = '019b0000-0000-7000-8000-000000000088' +const externalTaskId = '019b0000-0000-7000-8000-000000000089' +const externalNoteId = '019b0000-0000-7000-8000-000000000090' const searchRequests = [] +const workspaceRequests = [] const projectPatchRequests = [] let expectingProjectPatchError = false let expectedProjectPatchConsoleErrorCount = 0 @@ -83,6 +87,7 @@ await page.route('http://localhost:9150/api/v1/**', async (route) => { return } if (url.pathname === `/api/v1/projects/${projectId}/workspace`) { + workspaceRequests.push(url.pathname) await route.fulfill({ json: visualCheckWorkspace }) return } @@ -90,16 +95,22 @@ await page.route('http://localhost:9150/api/v1/**', async (route) => { const query = url.searchParams.get('q') ?? '' searchRequests.push(query) if (query === '慢请求') await new Promise((resolve) => setTimeout(resolve, 300)) - const projectIdForResult = query === '未知项目' ? unknownProjectId : projectId + const result = query === '外部任务' + ? { id: externalTaskId, type: 'task', title: '获授权外部任务', projectId: externalProjectId, snippet: '仅限处理合同签署' } + : query === '外部笔记' + ? { id: externalNoteId, type: 'note', title: '获授权外部笔记', projectId: externalProjectId, snippet: '仅共享合同背景段落' } + : query === '未知结果' + ? { id: 'untrusted-result', type: 'source', title: '未知类型结果', projectId: unknownProjectId, snippet: '不得预览或导航' } + : { + id: taskSearchResultId, + type: 'task', + title: query === '慢请求' ? '慢请求任务' : query === '快请求' ? '快请求任务' : '回调任务', + projectId, + snippet: '检查签名', + } await route.fulfill({ json: { - items: [{ - id: taskSearchResultId, - type: 'task', - title: query === '未知项目' ? '未知项目任务' : query === '慢请求' ? '慢请求任务' : query === '快请求' ? '快请求任务' : '回调任务', - projectId: projectIdForResult, - snippet: '检查签名', - }], + items: [result], }, }) return @@ -351,18 +362,67 @@ if (await searchInput.count() === 0 || await searchButton.count() === 0) { } } - await searchInput.fill('未知项目') + const projectBeforeExternalPreview = await page.locator('.project-title h5').textContent() + const externalWorkspacePath = `/api/v1/projects/${externalProjectId}/workspace` + + await searchInput.fill('外部任务') await searchButton.click() await page.waitForTimeout(150) - const unknownResult = page.getByRole('button', { name: /未知项目任务/ }) - if (await unknownResult.count() === 0) { - failures.push('Search button must submit the current query and show results') + const externalTaskResult = page.getByRole('button', { name: /获授权外部任务/ }) + if (await externalTaskResult.count() === 0) { + failures.push('authorized external task must render as a search result') + } else { + await externalTaskResult.click() + const preview = page.getByRole('dialog', { name: '授权对象预览' }) + if (await preview.count() === 0) { + failures.push('authorized external task must open a restricted preview') + } else { + for (const text of ['仅显示被授权对象', '获授权外部任务', '仅限处理合同签署', externalProjectId]) { + if (!await preview.getByText(text, { exact: false }).isVisible()) failures.push(`external task preview missing ${text}`) + } + await preview.getByRole('button', { name: '关闭预览', exact: true }).click() + } + } + + await searchInput.fill('外部笔记') + await searchButton.click() + await page.waitForTimeout(150) + const externalNoteResult = page.getByRole('button', { name: /获授权外部笔记/ }) + if (await externalNoteResult.count() === 0) { + failures.push('authorized external note must render as a search result') + } else { + await externalNoteResult.click() + const preview = page.getByRole('dialog', { name: '授权对象预览' }) + if (await preview.count() === 0) { + failures.push('authorized external note must open a restricted preview') + } else { + for (const text of ['仅显示被授权对象', '获授权外部笔记', '仅共享合同背景段落', externalProjectId]) { + if (!await preview.getByText(text, { exact: false }).isVisible()) failures.push(`external note preview missing ${text}`) + } + await preview.getByRole('button', { name: '关闭预览', exact: true }).click() + } + } + + if (workspaceRequests.includes(externalWorkspacePath)) { + failures.push('external previews must never load an unowned project workspace') + } + if (await page.locator('.project-title h5').textContent() !== projectBeforeExternalPreview) { + failures.push('external previews must not switch the active owned project') + } + + await searchInput.fill('未知结果') + await searchButton.click() + await page.waitForTimeout(150) + const unknownResult = page.getByRole('button', { name: /未知类型结果/ }) + if (await unknownResult.count() === 0) { + failures.push('fixture must expose the unknown result for its safety assertion') } else { - const projectBeforeUnknownResult = await page.locator('.project-title h5').textContent() await unknownResult.click() - const projectAfterUnknownResult = await page.locator('.project-title h5').textContent() - if (projectAfterUnknownResult !== projectBeforeUnknownResult) { - failures.push('a result for an unavailable project must not fabricate project navigation') + if (await page.getByRole('dialog', { name: '授权对象预览' }).count() !== 0) { + failures.push('unknown search result types must not open an authorized preview') + } + if (await page.locator('.project-title h5').textContent() !== projectBeforeExternalPreview) { + failures.push('unknown search results must not switch or fabricate a project') } } diff --git a/apps/web_v1/src/api/client.ts b/apps/web_v1/src/api/client.ts index e3c1af2..1d8f15c 100644 --- a/apps/web_v1/src/api/client.ts +++ b/apps/web_v1/src/api/client.ts @@ -8,6 +8,7 @@ type RequestOptions = { body?: unknown token?: string responseType?: 'json' | 'void' + signal?: AbortSignal } type ErrorEnvelope = { @@ -59,6 +60,7 @@ export async function apiRequest(path: string, options: RequestOptions = {}): ...(options.token ? { Authorization: `Bearer ${options.token}` } : {}), }, body: requestBody as BodyInit | undefined, + signal: options.signal, }) } catch { throw new ApiError(0, 'network_error', '无法连接服务器，请检查地址和网络后重试') diff --git a/apps/web_v1/src/api/search.ts b/apps/web_v1/src/api/search.ts index 7463eed..a6c8c52 100644 --- a/apps/web_v1/src/api/search.ts +++ b/apps/web_v1/src/api/search.ts @@ -14,7 +14,7 @@ export type SearchResponseDTO = { const searchPath = '/api/v1/search' -export async function searchWorkspace(session: ApiSession, query: string) { +export async function searchWorkspace(session: ApiSession, query: string, signal?: AbortSignal) { const search = new URLSearchParams({ q: query }) - return apiRequest(`${searchPath}?${search.toString()}`, { token: session.token }) + return apiRequest(`${searchPath}?${search.toString()}`, { token: session.token, signal }) } diff --git a/apps/web_v1/src/app/App.tsx b/apps/web_v1/src/app/App.tsx index 1f70b99..5867200 100644 --- a/apps/web_v1/src/app/App.tsx +++ b/apps/web_v1/src/app/App.tsx @@ -18,6 +18,7 @@ import { import type { SearchResultDTO } from '../api/search' import { LoginPage } from '../pages/login' import { ProjectActionModals, type CronDraft, type ProjectActionModal, type ProjectDraft, type SourceDraft, type TaskDraft } from '../pages/projects/project-action-modals' +import { SearchResultPreview } from '../pages/projects/search-result-preview' import type { ProjectSettingsUpdate } from '../pages/projects/project-sidebar' import { ProjectPage } from '../pages/workspace-home' import type { WorkspaceTaskUpdate } from '../pages/workspace-body' @@ -37,6 +38,7 @@ function App() { const [loading, setLoading] = useState(false) const [actionLoading, setActionLoading] = useState(false) const [activeModal, setActiveModal] = useState(null) + const [searchResultPreview, setSearchResultPreview] = useState(null) const workspaceSearch = useWorkbenchSearch(session) const dark = theme === 'dark' @@ -228,16 +230,20 @@ function App() { } function handleSelectSearchResult(result: SearchResultDTO) { - const owningWorkspace = workspaces.find((workspace) => workspace.project.id === result.projectId) - if (!owningWorkspace) { - Message.warning('该搜索结果所在项目当前不可访问') - return - } const target = searchResultTarget(result.type) if (!target) { Message.warning('该搜索结果暂不支持导航') return } + const owningWorkspace = workspaces.find((workspace) => workspace.project.id === result.projectId) + if (!owningWorkspace) { + if (isAuthorizedExternalPreview(result)) { + setSearchResultPreview(result) + } else { + Message.warning('该搜索结果所在项目当前不可访问') + } + return + } setActiveProjectID(owningWorkspace.project.id) setActiveView('project') setActiveChannel(target.channel) @@ -304,6 +310,7 @@ function App() { onCreateCronPlan={handleCreateCronPlan} tagOptions={activeTagOptions} /> + setSearchResultPreview(null)} /> ) @@ -316,4 +323,15 @@ function searchResultTarget(type: string): { channel: ChannelKey; openTask: bool return null } +function isAuthorizedExternalPreview(result: SearchResultDTO) { + return ( + (result.type === 'task' || result.type === 'note') + && typeof result.projectId === 'string' + && result.projectId.trim() !== '' + && typeof result.title === 'string' + && result.title.trim() !== '' + && typeof result.snippet === 'string' + ) +} + export default App diff --git a/apps/web_v1/src/app/search-request-gate.ts b/apps/web_v1/src/app/search-request-gate.ts new file mode 100644 index 0000000..e08fe61 --- /dev/null +++ b/apps/web_v1/src/app/search-request-gate.ts @@ -0,0 +1,29 @@ +export type SearchRequestTicket = { + signal: AbortSignal + isCurrent: () => boolean +} + +export function createSearchRequestGate() { + let generation = 0 + let controller: AbortController | null = null + + return { + begin(): SearchRequestTicket { + generation += 1 + controller?.abort() + controller = new AbortController() + const requestGeneration = generation + return { + signal: controller.signal, + isCurrent: () => requestGeneration === generation, + } + }, + invalidate() { + generation += 1 + controller?.abort() + controller = null + }, + } +} + +export type SearchRequestGate = ReturnType diff --git a/apps/web_v1/src/app/use-workbench-search.ts b/apps/web_v1/src/app/use-workbench-search.ts index 26c6aad..4fd2795 100644 --- a/apps/web_v1/src/app/use-workbench-search.ts +++ b/apps/web_v1/src/app/use-workbench-search.ts @@ -1,49 +1,63 @@ -import { useRef, useState } from 'react' +import { useEffect, useRef, useState } from 'react' import { Message } from '@arco-design/web-react' import type { ApiSession } from '../api/client' import { searchWorkspace, type SearchResultDTO } from '../api/search' +import { createSearchRequestGate, type SearchRequestGate } from './search-request-gate' export function useWorkbenchSearch(session: ApiSession | null) { const [query, setQuery] = useState('') const [results, setResults] = useState([]) const [loading, setLoading] = useState(false) const [searched, setSearched] = useState(false) - const requestSequence = useRef(0) + const requestGate = useRef(null) + if (!requestGate.current) requestGate.current = createSearchRequestGate() + + useEffect(() => { + const gate = requestGate.current + gate?.invalidate() + setQuery('') + setResults([]) + setLoading(false) + setSearched(false) + return () => gate?.invalidate() + }, [session]) function changeQuery(value: string) { - requestSequence.current += 1 + requestGate.current?.invalidate() setQuery(value) setLoading(false) setSearched(false) } async function submitSearch() { - const requestID = ++requestSequence.current const trimmedQuery = query.trim() if (!trimmedQuery) { + requestGate.current?.invalidate() setResults([]) setSearched(false) Message.warning('请输入搜索关键词') return } if (!session) { + requestGate.current?.invalidate() Message.error('未登录或登录已失效') return } + const request = requestGate.current!.begin() setLoading(true) setSearched(false) try { - const response = await searchWorkspace(session, trimmedQuery) - if (requestID !== requestSequence.current) return + const response = await searchWorkspace(session, trimmedQuery, request.signal) + if (!request.isCurrent()) return setResults(response.items) setSearched(true) } catch (error) { - if (requestID !== requestSequence.current) return + if (!request.isCurrent()) return setResults([]) Message.error(error instanceof Error ? error.message : '搜索失败，请稍后重试') } finally { - if (requestID === requestSequence.current) setLoading(false) + if (request.isCurrent()) setLoading(false) } } diff --git a/apps/web_v1/src/pages/projects/project-topbar.tsx b/apps/web_v1/src/pages/projects/project-topbar.tsx index aae314a..568ae03 100644 --- a/apps/web_v1/src/pages/projects/project-topbar.tsx +++ b/apps/web_v1/src/pages/projects/project-topbar.tsx @@ -121,10 +121,11 @@ export function ProjectTopbar({ ) } -function searchTypeLabel(type: SearchResultDTO['type']) { +function searchTypeLabel(type: string) { if (type === 'project') return '项目' if (type === 'task') return '任务' - return '笔记' + if (type === 'note') return '笔记' + return '未知' } function isDesktopRuntime() { diff --git a/apps/web_v1/src/pages/projects/search-result-preview.tsx b/apps/web_v1/src/pages/projects/search-result-preview.tsx new file mode 100644 index 0000000..b92f548 --- /dev/null +++ b/apps/web_v1/src/pages/projects/search-result-preview.tsx @@ -0,0 +1,37 @@ +import { Alert, Button, Descriptions, Modal, Space, Tag, Typography } from '@arco-design/web-react' +import type { SearchResultDTO } from '../../api/search' + +const { Paragraph, Text, Title } = Typography + +export function SearchResultPreview({ + result, + onClose, +}: { + result: SearchResultDTO | null + onClose: () => void +}) { + return ( + 关闭预览} + unmountOnExit + > + {result && ( + + + + {result.type === 'task' ? '任务' : '笔记'} + {result.title} + {result.snippet && {result.snippet}} + + {result.projectId} }]} + /> + + )} + + ) +} diff --git a/backend/internal/logic/search/service.go b/backend/internal/logic/search/service.go index 5445761..338ed85 100644 --- a/backend/internal/logic/search/service.go +++ b/backend/internal/logic/search/service.go @@ -1,7 +1,10 @@ package search import ( + "fmt" + "sort" "strings" + "time" "gorm.io/gorm" "senlinai-agent/backend/internal/models" @@ -11,7 +14,15 @@ type Service struct { db *gorm.DB } -const maxSearchResults = 50 +const ( + maxSearchResults = 50 + maxSearchSnippetRunes = 240 +) + +type rankedSearchResult struct { + result SearchResultDTO + updatedAt time.Time +} // SearchResultDTO 是搜索接口的稳定结果，所有关联均使用公开 identity。 type SearchResultDTO struct { @@ -42,84 +53,110 @@ func (s *Service) Search(userID uint, query string) ([]SearchResultDTO, error) { if query == "" { return []SearchResultDTO{}, nil } - if s.database().Dialector.Name() == "postgres" { - return s.searchPostgres(userID, query) - } like := containsPattern(query) - results := []SearchResultDTO{} + operator := "LIKE" + if s.database().Dialector.Name() == "postgres" { + operator = "ILIKE" + } + var projects []models.SenlinAgentProject - if err := s.database().Where("owner_id = ? AND (name LIKE ? ESCAPE '!' OR description LIKE ? ESCAPE '!')", userID, like, like).Limit(maxSearchResults).Find(&projects).Error; err != nil { + projectFilter := fmt.Sprintf("owner_id = ? AND (name %s ? ESCAPE '!' OR description %s ? ESCAPE '!')", operator, operator) + if err := s.database().Where(projectFilter, userID, like, like). + Order("updated_at DESC").Order("identity ASC"). + Limit(maxSearchResults).Find(&projects).Error; err != nil { return nil, err } + projectResults := make([]rankedSearchResult, 0, len(projects)) for _, project := range projects { - results = append(results, SearchResultDTO{Type: "project", ID: project.Identity, ProjectID: project.Identity, Title: project.Name, Snippet: project.Description}) + projectResults = append(projectResults, rankedSearchResult{ + result: SearchResultDTO{Type: "project", ID: project.Identity, ProjectID: project.Identity, Title: project.Name, Snippet: project.Description}, + updatedAt: project.UpdatedAt, + }) } var tasks []models.SenlinAgentTask + taskFilter := fmt.Sprintf("(senlin_agent_projects.owner_id = ? OR senlin_agent_tasks.assignee_id = ?) AND (senlin_agent_tasks.title %s ? ESCAPE '!' OR senlin_agent_tasks.description %s ? ESCAPE '!')", operator, operator) if err := s.database().Select("senlin_agent_tasks.*").Joins("JOIN senlin_agent_projects ON senlin_agent_projects.id = senlin_agent_tasks.project_id"). - Where("(senlin_agent_projects.owner_id = ? OR senlin_agent_tasks.assignee_id = ?) AND (senlin_agent_tasks.title LIKE ? ESCAPE '!' OR senlin_agent_tasks.description LIKE ? ESCAPE '!')", userID, userID, like, like). + Where(taskFilter, userID, userID, like, like). + Order("senlin_agent_tasks.updated_at DESC").Order("senlin_agent_tasks.identity ASC"). Limit(maxSearchResults). Find(&tasks).Error; err != nil { return nil, err } + taskResults := make([]rankedSearchResult, 0, len(tasks)) for _, task := range tasks { - results = append(results, SearchResultDTO{Type: "task", ID: task.Identity, ProjectID: task.ProjectIdentity, Title: task.Title, Snippet: task.Description}) + taskResults = append(taskResults, rankedSearchResult{ + result: SearchResultDTO{Type: "task", ID: task.Identity, ProjectID: task.ProjectIdentity, Title: task.Title, Snippet: task.Description}, + updatedAt: task.UpdatedAt, + }) } var notes []models.SenlinAgentNote - if err := s.database().Select("senlin_agent_notes.*").Joins("JOIN senlin_agent_projects ON senlin_agent_projects.id = senlin_agent_notes.project_id"). - Where(`(senlin_agent_projects.owner_id = ? OR EXISTS ( + noteFilter := fmt.Sprintf(`(senlin_agent_projects.owner_id = ? OR EXISTS ( SELECT 1 FROM senlin_agent_task_shares JOIN senlin_agent_tasks ON senlin_agent_tasks.id = senlin_agent_task_shares.task_id WHERE senlin_agent_task_shares.object_type = 'note' AND senlin_agent_task_shares.object_id = senlin_agent_notes.id AND senlin_agent_tasks.project_id = senlin_agent_notes.project_id AND senlin_agent_tasks.assignee_id = ? - )) AND (senlin_agent_notes.title LIKE ? ESCAPE '!' OR senlin_agent_notes.markdown LIKE ? ESCAPE '!')`, userID, userID, like, like). + )) AND (senlin_agent_notes.title %s ? ESCAPE '!' OR senlin_agent_notes.markdown %s ? ESCAPE '!')`, operator, operator) + if err := s.database().Select("senlin_agent_notes.*").Joins("JOIN senlin_agent_projects ON senlin_agent_projects.id = senlin_agent_notes.project_id"). + Where(noteFilter, userID, userID, like, like). + Order("senlin_agent_notes.updated_at DESC").Order("senlin_agent_notes.identity ASC"). Limit(maxSearchResults). Find(¬es).Error; err != nil { return nil, err } + noteResults := make([]rankedSearchResult, 0, len(notes)) for _, note := range notes { - results = append(results, SearchResultDTO{Type: "note", ID: note.Identity, ProjectID: note.ProjectIdentity, Title: note.Title, Snippet: note.Markdown}) + noteResults = append(noteResults, rankedSearchResult{ + result: SearchResultDTO{Type: "note", ID: note.Identity, ProjectID: note.ProjectIdentity, Title: note.Title, Snippet: note.Markdown}, + updatedAt: note.UpdatedAt, + }) } - if len(results) > maxSearchResults { - results = results[:maxSearchResults] - } - return results, nil + + return stableFairLimit(projectResults, taskResults, noteResults), nil } -func (s *Service) searchPostgres(userID uint, query string) ([]SearchResultDTO, error) { - var results []SearchResultDTO - like := containsPattern(query) - err := s.database().Raw(` - SELECT 'project' AS type, p.identity AS id, p.identity AS project_id, p.name AS title, p.description AS snippet - FROM senlin_agent_projects p - WHERE p.owner_id = ? - AND (coalesce(p.name, '') ILIKE ? ESCAPE '!' OR coalesce(p.description, '') ILIKE ? ESCAPE '!') - UNION ALL - SELECT 'task' AS type, t.identity AS id, p.identity AS project_id, t.title, t.description AS snippet - FROM senlin_agent_tasks t - JOIN senlin_agent_projects p ON p.id = t.project_id - WHERE (p.owner_id = ? OR t.assignee_id = ?) - AND (coalesce(t.title, '') ILIKE ? ESCAPE '!' OR coalesce(t.description, '') ILIKE ? ESCAPE '!') - UNION ALL - SELECT 'note' AS type, n.identity AS id, p.identity AS project_id, n.title, n.markdown AS snippet - FROM senlin_agent_notes n - JOIN senlin_agent_projects p ON p.id = n.project_id - WHERE (p.owner_id = ? OR EXISTS ( - SELECT 1 FROM senlin_agent_task_shares ts - JOIN senlin_agent_tasks t ON t.id = ts.task_id - WHERE ts.object_type = 'note' - AND ts.object_id = n.id - AND t.project_id = n.project_id - AND t.assignee_id = ? - )) - AND (coalesce(n.title, '') ILIKE ? ESCAPE '!' OR coalesce(n.markdown, '') ILIKE ? ESCAPE '!') - LIMIT ? - `, userID, like, like, userID, userID, like, like, userID, userID, like, like, maxSearchResults).Scan(&results).Error - return results, err +func stableFairLimit(buckets ...[]rankedSearchResult) []SearchResultDTO { + for _, bucket := range buckets { + sort.Slice(bucket, func(left, right int) bool { + if bucket[left].updatedAt.Equal(bucket[right].updatedAt) { + return bucket[left].result.ID < bucket[right].result.ID + } + return bucket[left].updatedAt.After(bucket[right].updatedAt) + }) + } + + results := make([]SearchResultDTO, 0, maxSearchResults) + for position := 0; len(results) < maxSearchResults; position++ { + added := false + for _, bucket := range buckets { + if position >= len(bucket) { + continue + } + result := bucket[position].result + result.Snippet = boundedSnippet(result.Snippet) + results = append(results, result) + added = true + if len(results) == maxSearchResults { + return results + } + } + if !added { + return results + } + } + return results +} + +func boundedSnippet(value string) string { + runes := []rune(value) + if len(runes) <= maxSearchSnippetRunes { + return value + } + return string(runes[:maxSearchSnippetRunes]) } func containsPattern(query string) string { diff --git a/backend/internal/logic/search/service_postgres_test.go b/backend/internal/logic/search/service_postgres_test.go index 7ae444b..70e4ef2 100644 --- a/backend/internal/logic/search/service_postgres_test.go +++ b/backend/internal/logic/search/service_postgres_test.go @@ -1,8 +1,11 @@ package search import ( + "fmt" "os" + "strings" "testing" + "time" "github.com/stretchr/testify/require" "gorm.io/driver/postgres" @@ -45,6 +48,65 @@ func TestPostgresSearchKeepsAssignmentAndExplicitShareBoundaries(t *testing.T) { require.ElementsMatch(t, []string{assigned.Identity, sharedNote.Identity}, []string{results[0].ID, results[1].ID}) } +func TestPostgresSearchUsesStableFairLimitAndRuneBoundedSnippets(t *testing.T) { + database := newPostgresSearchTestDB(t) + owner := createSearchUser(t, database, "postgres-search-order@example.com") + baseTime := time.Date(2026, time.July, 21, 12, 0, 0, 0, time.UTC) + for index := 0; index < 60; index++ { + project := models.SenlinAgentProject{ + Identity: fmt.Sprintf("00000000-0000-7001-8000-%012d", index), + OwnerID: owner.ID, + Name: fmt.Sprintf("稳定排序项目 %02d", index), + Identifier: fmt.Sprintf("PG-SORT-%02d", index), + UpdatedAt: baseTime.Add(time.Duration(index) * time.Minute), + } + require.NoError(t, database.Create(&project).Error) + require.NoError(t, database.Create(&models.SenlinAgentTask{ + Identity: fmt.Sprintf("00000000-0000-7002-8000-%012d", index), + ProjectID: project.ID, + CreatedBy: owner.ID, + Title: fmt.Sprintf("稳定排序任务 %02d", index), + Status: "open", + UpdatedAt: baseTime.Add(time.Duration(index) * time.Minute), + }).Error) + require.NoError(t, database.Create(&models.SenlinAgentNote{ + Identity: fmt.Sprintf("00000000-0000-7003-8000-%012d", index), + ProjectID: project.ID, + CreatedBy: owner.ID, + Title: fmt.Sprintf("稳定排序笔记 %02d", index), + Markdown: strings.Repeat("森", 300) + "尾", + UpdatedAt: baseTime.Add(time.Duration(index) * time.Minute), + }).Error) + } + + service := NewService(database) + results, err := service.Search(owner.ID, "稳定排序") + require.NoError(t, err) + require.Len(t, results, maxSearchResults) + require.Equal(t, + []string{"project", "task", "note", "project", "task", "note", "project", "task", "note"}, + resultTypes(results[:9]), + ) + require.Equal(t, "00000000-0000-7001-8000-000000000059", results[0].ID) + require.Equal(t, "00000000-0000-7002-8000-000000000059", results[1].ID) + require.Equal(t, "00000000-0000-7003-8000-000000000059", results[2].ID) + counts := map[string]int{} + for _, result := range results { + counts[result.Type]++ + } + require.Equal(t, map[string]int{"project": 17, "task": 17, "note": 16}, counts) + + again, err := service.Search(owner.ID, "稳定排序") + require.NoError(t, err) + require.Equal(t, results, again) + + noteResults, err := service.Search(owner.ID, "森") + require.NoError(t, err) + require.NotEmpty(t, noteResults) + require.Len(t, []rune(noteResults[0].Snippet), 240) + require.NotContains(t, noteResults[0].Snippet, "尾") +} + func newPostgresSearchTestDB(t *testing.T) *gorm.DB { t.Helper() dsn := os.Getenv("DATABASE_URL") diff --git a/backend/internal/logic/search/service_test.go b/backend/internal/logic/search/service_test.go index aa7220a..9dd5f56 100644 --- a/backend/internal/logic/search/service_test.go +++ b/backend/internal/logic/search/service_test.go @@ -2,7 +2,9 @@ package search import ( "fmt" + "strings" "testing" + "time" "github.com/glebarez/sqlite" "github.com/stretchr/testify/require" @@ -26,6 +28,91 @@ func TestSearchFindsNoteBody(t *testing.T) { require.Equal(t, "note", results[0].Type) } +func TestSearchAppliesStableFairGlobalLimitAcrossResultTypes(t *testing.T) { + database, err := gorm.Open(sqlite.Open(fmt.Sprintf("file:%s?mode=memory&cache=shared", t.Name())), &gorm.Config{}) + require.NoError(t, err) + require.NoError(t, models.AutoMigrate(database)) + models.DBService = database + + baseTime := time.Date(2026, time.July, 21, 12, 0, 0, 0, time.UTC) + for index := 0; index < 60; index++ { + project := models.SenlinAgentProject{ + Identity: fmt.Sprintf("00000000-0000-7001-8000-%012d", index), + OwnerID: 7, + Name: fmt.Sprintf("稳定排序项目 %02d", index), + Identifier: fmt.Sprintf("SORT-%02d", index), + UpdatedAt: baseTime.Add(time.Duration(index) * time.Minute), + } + require.NoError(t, database.Create(&project).Error) + require.NoError(t, database.Create(&models.SenlinAgentTask{ + Identity: fmt.Sprintf("00000000-0000-7002-8000-%012d", index), + ProjectID: project.ID, + CreatedBy: 7, + Title: fmt.Sprintf("稳定排序任务 %02d", index), + Status: "open", + UpdatedAt: baseTime.Add(time.Duration(index) * time.Minute), + }).Error) + require.NoError(t, database.Create(&models.SenlinAgentNote{ + Identity: fmt.Sprintf("00000000-0000-7003-8000-%012d", index), + ProjectID: project.ID, + CreatedBy: 7, + Title: fmt.Sprintf("稳定排序笔记 %02d", index), + UpdatedAt: baseTime.Add(time.Duration(index) * time.Minute), + }).Error) + } + + service := NewService(database) + results, err := service.Search(7, "稳定排序") + require.NoError(t, err) + require.Len(t, results, maxSearchResults) + + counts := map[string]int{} + for _, result := range results { + counts[result.Type]++ + } + require.Equal(t, map[string]int{"project": 17, "task": 17, "note": 16}, counts) + require.Equal(t, + []string{"project", "task", "note", "project", "task", "note", "project", "task", "note"}, + resultTypes(results[:9]), + ) + require.Equal(t, "00000000-0000-7001-8000-000000000059", results[0].ID) + require.Equal(t, "00000000-0000-7002-8000-000000000059", results[1].ID) + require.Equal(t, "00000000-0000-7003-8000-000000000059", results[2].ID) + + again, err := service.Search(7, "稳定排序") + require.NoError(t, err) + require.Equal(t, results, again) +} + +func TestSearchBoundsChineseSnippetsByRune(t *testing.T) { + database, err := gorm.Open(sqlite.Open(fmt.Sprintf("file:%s?mode=memory&cache=shared", t.Name())), &gorm.Config{}) + require.NoError(t, err) + require.NoError(t, models.AutoMigrate(database)) + models.DBService = database + project := models.SenlinAgentProject{OwnerID: 7, Name: "摘要项目", Identifier: "SNIPPET"} + require.NoError(t, database.Create(&project).Error) + require.NoError(t, database.Create(&models.SenlinAgentNote{ + ProjectID: project.ID, + CreatedBy: 7, + Title: "中文摘要", + Markdown: strings.Repeat("森", 300) + "尾", + }).Error) + + results, err := NewService(database).Search(7, "森") + require.NoError(t, err) + require.Len(t, results, 1) + require.Len(t, []rune(results[0].Snippet), 240) + require.NotContains(t, results[0].Snippet, "尾") +} + +func resultTypes(results []SearchResultDTO) []string { + types := make([]string, 0, len(results)) + for _, result := range results { + types = append(types, result.Type) + } + return types +} + func TestSearchOnlyReturnsNavigableProjectTaskAndNoteResults(t *testing.T) { database, err := gorm.Open(sqlite.Open(fmt.Sprintf("file:%s?mode=memory&cache=shared", t.Name())), &gorm.Config{}) require.NoError(t, err)