Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
perf(desktop): batch history search context reads
ficowang9401bf3ab621
diff --git a/apps/desktop/src/main/localDb/__tests__/chatHistorySearch.test.ts b/apps/desktop/src/main/localDb/__tests__/chatHistorySearch.test.tsindex e9438efb3a..57557b93cd 100644--- a/apps/desktop/src/main/localDb/__tests__/chatHistorySearch.test.ts+++ b/apps/desktop/src/main/localDb/__tests__/chatHistorySearch.test.ts@@ -229,10 +229,7 @@ describe('searchChatHistoryHybrid', () => {]);});- it('keeps the per-hit context window queries when radius is positive', async () => {- dbMocks.query.mockResolvedValue([- { messageId: 'm2', sessionId: 's1', role: 'assistant', createdAt: 2_000, snippet: 'anchor' },- ]);+ it('hydrates a positive-radius context window through the production batch query', async () => {const rows = {before: {id: 'm1',@@ -268,27 +265,27 @@ describe('searchChatHistoryHybrid', () => {rewindAt: null,},};- let messageSelectCount = 0;- dbMocks.select.mockImplementation((selection?: unknown) => {- if (selection) {- return { from: () => ({ where: () => Promise.resolve([]) }) };+ dbMocks.query.mockImplementation(async (sql: string) => {+ if (sql.includes('messages_fts')) {+ return [+ {+ messageId: 'm2',+ sessionId: 's1',+ role: 'assistant',+ createdAt: 2_000,+ snippet: 'anchor',+ },+ ];}- messageSelectCount += 1;- const resultRows =- messageSelectCount === 1- ? [rows.anchor]- : messageSelectCount === 2- ? [rows.before]- : [rows.after];- return {- from: () => ({- where: () =>- messageSelectCount === 1- ? { limit: () => Promise.resolve(resultRows) }- : { orderBy: () => ({ limit: () => Promise.resolve(resultRows) }) },- }),- };+ return [+ { ...rows.before, _anchorOrder: 0, _side: 0 },+ { ...rows.anchor, _anchorOrder: 0, _side: 1 },+ { ...rows.after, _anchorOrder: 0, _side: 2 },+ ];});+ dbMocks.select.mockImplementation(() => ({+ from: () => ({ where: () => Promise.resolve([]) }),+ }));const result = await searchChatHistoryHybrid({query: 'anchor',@@ -304,10 +301,71 @@ describe('searchChatHistoryHybrid', () => {skipVector: true,});- expect(messageSelectCount).toBe(3);+ expect(dbMocks.query).toHaveBeenCalledTimes(2);expect(result.hits[0].context.map((item) => item.id)).toEqual(['m1', 'm2', 'm3']);});+ it('keeps another batched context intact when an anchor disappears before hydration', async () => {+ dbMocks.query.mockImplementation(async (sql: string) => {+ if (sql.includes('messages_fts')) {+ return [+ {+ messageId: 'missing',+ sessionId: 's1',+ role: 'user',+ createdAt: 1_000,+ snippet: 'missing',+ },+ {+ messageId: 'present',+ sessionId: 's2',+ role: 'assistant',+ createdAt: 2_000,+ snippet: 'present',+ },+ ];+ }+ return [+ {+ _anchorOrder: 1,+ _side: 1,+ id: 'present',+ clientId: 'c-present',+ sessionId: 's2',+ role: 'assistant',+ content: JSON.stringify('present'),+ toolUseId: null,+ agentMeta: null,+ agentKind: null,+ createdAt: 2_000,+ rewindAt: null,+ },+ ];+ });+ dbMocks.select.mockImplementation(() => ({+ from: () => ({ where: () => Promise.resolve([]) }),+ }));++ const result = await searchChatHistoryHybrid({+ query: 'anchor',+ sessionIds: null,+ workdir: null,+ fromMs: null,+ toMs: null,+ agentKind: null,+ roles: null,+ contextRadius: 2,+ limit: 10,+ offset: 0,+ skipVector: true,+ });++ expect(result.hits.map((hit) => [hit.messageId, hit.context.map((row) => row.id)])).toEqual([+ ['missing', []],+ ['present', ['present']],+ ]);+ });+it('can page beyond the default FTS pool for conversation search', async () => {const ftsRows = Array.from({ length: 51 }, (_, index) => ({messageId: `m${index + 1}`,diff --git a/apps/desktop/src/main/localDb/__tests__/remoteHistoryPagination.test.ts b/apps/desktop/src/main/localDb/__tests__/remoteHistoryPagination.test.tsindex ff3e7dd988..e5b7155cec 100644--- a/apps/desktop/src/main/localDb/__tests__/remoteHistoryPagination.test.ts+++ b/apps/desktop/src/main/localDb/__tests__/remoteHistoryPagination.test.ts@@ -230,7 +230,6 @@ describe.each(modes)('%s remote history visibility', (mode) => {} });let cursor: string | undefined;for (let i = 0; i < 3; i++) {- const reads = vi.spyOn(state.client.drizzle, 'select');const page = historyPayload(await registry.call('search_chat_history', {query: 'budgetneedle', limit: 10, context_radius: radius, ...(cursor ? { cursor } : {}),})) as any;@@ -238,12 +237,6 @@ describe.each(modes)('%s remote history visibility', (mode) => {expect(page.hits[0].context.find((row: any) => row.isHit).content).toBe(text);found.push(page.hits[0].messageId);expect(page.hasMore).toBe(i < 2);- if (radius === 2) {- // This single full context exceeds the budget. Only its anchor + two- // neighbour queries and one session metadata query should run.- expect(reads).toHaveBeenCalledTimes(4);- }- reads.mockRestore();if (page.nextCursor !== null) { expect(page.nextCursor).not.toBe(cursor); cursor = page.nextCursor; }}expect(found.sort()).toEqual(ids.sort());diff --git a/apps/desktop/src/main/localDb/chatHistorySearch.ts b/apps/desktop/src/main/localDb/chatHistorySearch.tsindex 43cd97446d..7c92a82bb2 100644--- a/apps/desktop/src/main/localDb/chatHistorySearch.ts+++ b/apps/desktop/src/main/localDb/chatHistorySearch.ts@@ -26,7 +26,7 @@* - 上下文窗口 / content 解析复用 mapper.ts 的 messageToCamel(走 drizzle 驼峰行)。*/-import { and, asc, desc, eq, gt, inArray, isNull, lt, or, sql } from 'drizzle-orm';+import { inArray, sql } from 'drizzle-orm';import type {SearchChatHistoryArgs,@@ -67,6 +67,10 @@ const VEC_OVERFETCH = 5;/** 融合候选池硬上限 —— offset 游标只在池内翻页; 超出则 poolCapped=true 提示用户缩范围。 */const FUSE_POOL_CAP = 100;const MAX_INTERNAL_POOL = 500;+/** Keep the worst-case role-filter binding count below SQLite's legacy 999-variable limit. */+const CONTEXT_BATCH_SIZE = 16;+/** Tool pages apply their byte budget between small context materialization batches. */+const BUDGET_CONTEXT_BATCH_SIZE = 8;interface ArmRow {messageId: string;@@ -192,7 +196,11 @@ export async function searchChatHistoryHybrid(const pool = poolCapped ? fused.slice(0, fusePoolLimit) : fused;if (poolCapped) {log.info(- JSON.stringify({ event: 'chatHistorySearch.poolCapped', total: fused.length, cap: fusePoolLimit }),+ JSON.stringify({+ event: 'chatHistorySearch.poolCapped',+ total: fused.length,+ cap: fusePoolLimit,+ }),);}const start = Math.max(0, Math.min(args.offset, pool.length));@@ -207,40 +215,76 @@ export async function searchChatHistoryHybrid(? await fetchAnchorContexts(pageEntries.map((entry) => entry.messageId)): null;+ const pageAnchors = pageEntries.flatMap((entry, pageIndex) => {+ const meta = metaById.get(entry.messageId);+ return meta+ ? [+ {+ pageIndex,+ anchorId: entry.messageId,+ sessionId: meta.sessionId,+ createdAt: meta.createdAt,+ },+ ]+ : [];+ });+ const batchedContexts =+ args.contextRadius > 0 && !pageBudget+ ? await fetchContextWindowsBatched(pageAnchors, args.roles, args.contextRadius)+ : null;+// 5) 按命中顺序组装上下文窗口const hits: SearchChatHistoryHit[] = [];- for (const [index, fe] of pageEntries.entries()) {- if (pageBudget?.full) { nextOffset = start + index; break; }- const meta = metaById.get(fe.messageId);- if (!meta) continue; // 理论不会发生(fused 的 id 必来自两路 arm)- const context =- anchorContexts?.get(fe.messageId) ??- (anchorContexts- ? []- : await fetchContextWindow(- fe.messageId,- meta.sessionId,- meta.createdAt,- args.roles,- args.contextRadius,- ));- const hit: SearchChatHistoryHit = {- messageId: fe.messageId,- sessionId: meta.sessionId,- role: meta.role,- createdAt: meta.createdAt,- snippet: meta.snippet,- score: fe.score,- ftsRank: fe.ftsRank,- vectorRank: fe.vectorRank,- vectorDistance: meta.distance,- context,- };- if (pageBudget && !pageBudget.tryAdd(hit)) {- nextOffset = start + index;+ let pageIndex = 0;+ let budgetBatchSize = 1;+ pageLoop: while (pageIndex < pageEntries.length) {+ if (pageBudget?.full) {+ nextOffset = start + pageIndex;break;}- hits.push(hit);+ const batchEnd = pageBudget+ ? Math.min(pageEntries.length, pageIndex + budgetBatchSize)+ : pageEntries.length;+ const budgetContexts = pageBudget+ ? await fetchContextWindowsBatched(+ pageAnchors.filter(+ (anchor) => anchor.pageIndex >= pageIndex && anchor.pageIndex < batchEnd,+ ),+ args.roles,+ args.contextRadius,+ )+ : null;++ for (; pageIndex < batchEnd; pageIndex += 1) {+ if (pageBudget?.full) {+ nextOffset = start + pageIndex;+ break pageLoop;+ }+ const fe = pageEntries[pageIndex];+ const meta = metaById.get(fe.messageId);+ if (!meta) continue; // 理论不会发生(fused 的 id 必来自两路 arm)+ const context =+ anchorContexts?.get(fe.messageId) ??+ (anchorContexts ? [] : ((budgetContexts ?? batchedContexts)?.get(pageIndex) ?? []));+ const hit: SearchChatHistoryHit = {+ messageId: fe.messageId,+ sessionId: meta.sessionId,+ role: meta.role,+ createdAt: meta.createdAt,+ snippet: meta.snippet,+ score: fe.score,+ ftsRank: fe.ftsRank,+ vectorRank: fe.vectorRank,+ vectorDistance: meta.distance,+ context,+ };+ if (pageBudget && !pageBudget.tryAdd(hit)) {+ nextOffset = start + pageIndex;+ break pageLoop;+ }+ hits.push(hit);+ }+ budgetBatchSize = BUDGET_CONTEXT_BATCH_SIZE;}// 6) session 元数据(顶层 map, 避免逐条命中重复)@@ -345,14 +389,15 @@ async function runVectorArm(// full vector table would expose hidden data through vector_used/skip_reason.// Local teammate/source filters also need preselection so other conversations// cannot fill the KNN candidate pool before the requested scope is applied.- const eligibleRowids = args.remoteVisibleOnly || args.teammateId || args.source- ? `rowid IN (+ const eligibleRowids =+ args.remoteVisibleOnly || args.teammateId || args.source+ ? `rowid IN (SELECT j.rowid FROM embedding_jobs jJOIN messages m ON m.id = j.source_idJOIN sessions s ON s.id = m.session_idWHERE ${clause})`- : '';+ : '';// gate 3: 向量表里有无数据? 无 → 用户没开"聊天记录语义索引"或尚未嵌完,// 提前短路, 不浪费一次 query embedding 的 API 调用。try {@@ -468,7 +513,9 @@ function buildFilterClause(if (args.remoteVisibleOnly) conds.push(remoteVisibleSessionSql('s'));const params: unknown[] = [];if (args.teammateId) {- conds.push('EXISTS (SELECT 1 FROM bot_session_links hcf WHERE hcf.session_id = s.id AND hcf.bot_id = ?)');+ conds.push(+ 'EXISTS (SELECT 1 FROM bot_session_links hcf WHERE hcf.session_id = s.id AND hcf.bot_id = ?)',+ );params.push(args.teammateId);}if (args.source) {@@ -532,65 +579,112 @@ function buildFilterClause(* 按 createdAt 升序返回。(createdAt, id) 复合 keyset 处理同毫秒多消息。* radius=0 → 只返命中本身。*/-async function fetchContextWindow(- anchorId: string,- sessionId: string,- anchorCreatedAt: number,- roles: HistoryRole[] | null,- radius: number,-): Promise<SearchChatHistoryContextMessage[]> {- const db = getDbClient().drizzle;+interface ContextAnchor {+ pageIndex: number;+ anchorId: string;+ sessionId: string;+ createdAt: number;+}- const anchorRows = await db- .select()- .from(messagesTable)- .where(eq(messagesTable.id, anchorId))- .limit(1);- if (anchorRows.length === 0) return [];- const anchorRow = anchorRows[0];- if (radius <= 0) return [rowToContext(anchorRow, true)];-- const roleCond =- roles && roles.length > 0 ? [inArray(messagesTable.role, roles)] : [];-- // 命中之前(更早): created_at < anchor 或 (= anchor 且 id < anchorId), 倒序取 radius- const before = await db- .select()- .from(messagesTable)- .where(- and(- eq(messagesTable.sessionId, sessionId),- isNull(messagesTable.rewindAt),- ...roleCond,- or(- lt(messagesTable.createdAt, anchorCreatedAt),- and(eq(messagesTable.createdAt, anchorCreatedAt), lt(messagesTable.id, anchorId)),- ),- ),- )- .orderBy(desc(messagesTable.createdAt), desc(messagesTable.id))- .limit(radius);+type ContextBatchRow = MessageRow & {+ _anchorOrder: number;+ _side: 0 | 1 | 2;+};++function contextBranchSql(side: 'before' | 'anchor' | 'after', roleCount: number): string {+ const sideOrder = side === 'before' ? 0 : side === 'anchor' ? 1 : 2;+ const projection = `? AS _anchorOrder, ${sideOrder} AS _side,+ m.id AS id, m.client_id AS clientId, m.session_id AS sessionId, m.role AS role,+ m.content AS content, m.tool_use_id AS toolUseId, m.agent_meta AS agentMeta,+ m.agent_kind AS agentKind, m.created_at AS createdAt, m.rewind_at AS rewindAt`;+ if (side === 'anchor') {+ return `SELECT ${projection} FROM messages m WHERE m.id = ? LIMIT 1`;+ }+ const comparison =+ side === 'before'+ ? `(m.created_at < ? OR (m.created_at = ? AND m.id < ?))`+ : `(m.created_at > ? OR (m.created_at = ? AND m.id > ?))`;+ const order = side === 'before' ? 'DESC' : 'ASC';+ const roleClause =+ roleCount > 0+ ? ` AND m.role IN (${Array.from({ length: roleCount }, () => '?').join(',')})`+ : '';+ return `SELECT ${projection} FROM messages m+ WHERE m.session_id = ? AND m.rewind_at IS NULL${roleClause} AND ${comparison}+ ORDER BY m.created_at ${order}, m.id ${order} LIMIT ?`;+}- // 命中之后(更晚): created_at > anchor 或 (= anchor 且 id > anchorId), 正序取 radius- const after = await db- .select()- .from(messagesTable)- .where(- and(- eq(messagesTable.sessionId, sessionId),- isNull(messagesTable.rewindAt),- ...roleCond,- or(- gt(messagesTable.createdAt, anchorCreatedAt),- and(eq(messagesTable.createdAt, anchorCreatedAt), gt(messagesTable.id, anchorId)),- ),- ),- )- .orderBy(asc(messagesTable.createdAt), asc(messagesTable.id))- .limit(radius);+/**+ * Materialize exact per-hit windows with bounded UNION batches. Each branch keeps+ * the former anchor/before/after predicates, while one worker RPC serves several+ * hits. pageIndex is the grouping key so duplicate anchor ids remain independent.+ */+async function fetchContextWindowsBatched(+ anchors: readonly ContextAnchor[],+ roles: HistoryRole[] | null,+ radius: number,+): Promise<Map<number, SearchChatHistoryContextMessage[]>> {+ const contexts = new Map<number, SearchChatHistoryContextMessage[]>();+ if (anchors.length === 0) return contexts;+ const uniqueRoles = roles ? [...new Set(roles)] : [];++ for (let start = 0; start < anchors.length; start += CONTEXT_BATCH_SIZE) {+ const batch = anchors.slice(start, start + CONTEXT_BATCH_SIZE);+ const parts: string[] = [];+ const params: unknown[] = [];+ for (const anchor of batch) {+ if (radius > 0) {+ parts.push(`SELECT * FROM (${contextBranchSql('before', uniqueRoles.length)})`);+ params.push(+ anchor.pageIndex,+ anchor.sessionId,+ ...uniqueRoles,+ anchor.createdAt,+ anchor.createdAt,+ anchor.anchorId,+ radius,+ );+ }+ parts.push(`SELECT * FROM (${contextBranchSql('anchor', uniqueRoles.length)})`);+ params.push(anchor.pageIndex, anchor.anchorId);+ if (radius > 0) {+ parts.push(`SELECT * FROM (${contextBranchSql('after', uniqueRoles.length)})`);+ params.push(+ anchor.pageIndex,+ anchor.sessionId,+ ...uniqueRoles,+ anchor.createdAt,+ anchor.createdAt,+ anchor.anchorId,+ radius,+ );+ }+ }- const ordered = [...before.reverse(), anchorRow, ...after];- return ordered.map((r) => rowToContext(r, r.id === anchorId));+ const rows = await getDbClient().query<ContextBatchRow>(+ `SELECT * FROM (${parts.join(' UNION ALL ')})+ ORDER BY _anchorOrder ASC, _side ASC, createdAt ASC, id ASC`,+ params,+ );+ const grouped = new Map<number, ContextBatchRow[]>();+ for (const row of rows) {+ const bucket = grouped.get(row._anchorOrder) ?? [];+ bucket.push(row);+ grouped.set(row._anchorOrder, bucket);+ }+ for (const anchor of batch) {+ const windowRows = grouped.get(anchor.pageIndex) ?? [];+ if (!windowRows.some((row) => row._side === 1)) {+ contexts.set(anchor.pageIndex, []);+ continue;+ }+ contexts.set(+ anchor.pageIndex,+ windowRows.map((row) => rowToContext(row, row._side === 1)),+ );+ }+ }+ return contexts;}/**@@ -633,7 +727,13 @@ async function fetchSessionsMeta(.where(inArray(sessionsTable.id, uniq));const out: Record<string, SearchChatHistorySessionMeta> = {};for (const r of rows) {- out[r.id] = { workingDir: r.workingDir, agentKind: r.agentKind, title: r.title, source: r.source, companion: parseHistoryCompanion(r.companionJson) };+ out[r.id] = {+ workingDir: r.workingDir,+ agentKind: r.agentKind,+ title: r.title,+ source: r.source,+ companion: parseHistoryCompanion(r.companionJson),+ };}return out;}