Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(chat): fence retraction reference cleanup across clear
xdba60af189950
diff --git a/apps/desktop/src/main/git-context/prRefsStore.ts b/apps/desktop/src/main/git-context/prRefsStore.tsindex f923eb09d2..ec9d65a56c 100644--- a/apps/desktop/src/main/git-context/prRefsStore.ts+++ b/apps/desktop/src/main/git-context/prRefsStore.ts@@ -13,6 +13,7 @@ import { createId } from '@paralleldrive/cuid2';import { and, asc, desc, eq, gt, inArray, isNull, like, or, sql } from 'drizzle-orm';import { getDbClient, getCurrentDbClientUserId } from '../localDb/client/current';+import type { DbClient } from '../localDb/client/DbClient';import { messages, migrationMeta, sessionPrRefs, sessions } from '../localDb/schema';import { createLogger } from '../logger.js';import { extractPrRefs, messageContentToText, type PrRef } from './prRefExtractor.js';@@ -127,15 +128,21 @@ export async function recordPrRefsForImportedMessages(* authoritative=true(重算路径,按 createdAt 升序处理)则直接覆盖——* 被 rewind/clear 掉的"更晚提及"残留的时间戳必须被纠正回存活集的真实值。*/+interface PrRefsRecomputeScope {+ dbClient: DbClient;+ isCurrent: () => boolean;+}+async function upsertPrRefs(sessionId: string,refs: PrRef[],atMs?: number,- opts?: { authoritative?: boolean },+ opts?: { authoritative?: boolean; scope?: PrRefsRecomputeScope },): Promise<void> {- const db = getDbClient().drizzle;+ const db = (opts?.scope?.dbClient ?? getDbClient()).drizzle;const ts = atMs ?? Date.now();for (const ref of refs) {+ if (opts?.scope && !opts.scope.isCurrent()) return;await db.insert(sessionPrRefs).values({@@ -251,14 +258,19 @@ export async function ensurePrRefsBackfill(): Promise<void> {* 做法:删全量后按存活消息重提取,时间戳用消息原始 createdAt;完成广播刷新。* rewind / clear 都是低频操作,全量重算可接受。*/-export async function recomputePrRefsForSession(sessionId: string): Promise<void> {+export async function recomputePrRefsForSession(+ sessionId: string,+ scope?: PrRefsRecomputeScope,+): Promise<void> {try {- const db = getDbClient().drizzle;+ if (scope && !scope.isCurrent()) return;+ const db = (scope?.dbClient ?? getDbClient()).drizzle;const [sessionRow] = await db.select({ clearedAt: sessions.clearedAt }).from(sessions).where(eq(sessions.id, sessionId)).limit(1);+ if (scope && !scope.isCurrent()) return;const clearedAt = sessionRow?.clearedAt ?? null;const conds = [@@ -279,14 +291,17 @@ export async function recomputePrRefsForSession(sessionId: string): Promise<void// 已写不会自愈(Greptile review P1)。改为先 upsert 存活集(authoritative// 时间戳,升序处理保证 lastSeenAt 终值正确),最后再删不在存活集里的旧行:// 任何中断点都只会"多"不会"少",下次重算自然收敛,无需事务。+ if (scope && !scope.isCurrent()) return;const keep = new Set<string>();for (const row of rows) {+ if (scope && !scope.isCurrent()) return;const refs = extractPrRefs(row.content);if (refs.length === 0) continue;for (const ref of refs) keep.add(`${ref.owner}/${ref.repo}#${ref.prNumber}`);- await upsertPrRefs(sessionId, refs, row.createdAt, { authoritative: true });+ await upsertPrRefs(sessionId, refs, row.createdAt, { authoritative: true, scope });}+ if (scope && !scope.isCurrent()) return;const existing = await db.select({id: sessionPrRefs.id,@@ -296,13 +311,14 @@ export async function recomputePrRefsForSession(sessionId: string): Promise<void}).from(sessionPrRefs).where(eq(sessionPrRefs.sessionId, sessionId));+ if (scope && !scope.isCurrent()) return;const staleIds = existing.filter((r) => !keep.has(`${r.owner}/${r.repo}#${r.prNumber}`)).map((r) => r.id);if (staleIds.length > 0) {await db.delete(sessionPrRefs).where(inArray(sessionPrRefs.id, staleIds));}- onRefsChanged?.(sessionId);+ if (!scope || scope.isCurrent()) onRefsChanged?.(sessionId);} catch (err) {log.warn('recompute pr refs failed', {sessionId,diff --git a/apps/desktop/src/main/localDb/ipc/__tests__/assistantFinalRetraction.test.ts b/apps/desktop/src/main/localDb/ipc/__tests__/assistantFinalRetraction.test.tsindex 05603ec853..9d382585d7 100644--- a/apps/desktop/src/main/localDb/ipc/__tests__/assistantFinalRetraction.test.ts+++ b/apps/desktop/src/main/localDb/ipc/__tests__/assistantFinalRetraction.test.ts@@ -7,7 +7,7 @@ import { tx } from '../../worker/opHandlers/tx';import { discardPersistedAssistantMessage } from '../messages';import * as prRefsStore from '../../../git-context/prRefsStore';import { onAssistantTextEvent, clearSessionPersistState, drainPersistQueue,- flushAssistantBlock } from '../../../messagePersistBroadcaster';+ flushAssistantBlock, noteSessionClearBoundary } from '../../../messagePersistBroadcaster';const h = vi.hoisted(() => ({sqlite: null as Database.Database | null,@@ -200,3 +200,49 @@ it('orders retraction cleanup after the original asynchronous PR publication hooexpect(await prRefsStore.listPrRefs('s1')).toHaveLength(0);} finally { release(); hook.mockRestore(); }});+++it('does not restore pre-clear PR references when retraction cleanup resumes after clear', async () => {+ onAssistantTextEvent('s1', { text: 'https://github.com/o/r/pull/1', agentMessageId: 'keep' }, null);+ flushAssistantBlock('s1');+ onAssistantTextEvent('s1', { text: 'https://github.com/o/r/pull/2', agentMessageId: 'withdraw' }, null);+ flushAssistantBlock('s1');+ await drainPersistQueue();+ let release!: () => void;+ const resume = new Promise<void>((resolve) => { release = resolve; });+ let captured!: () => void;+ const snapshotTaken = new Promise<void>((resolve) => { captured = resolve; });+ const db = h.client!.drizzle;+ const select = db.select.bind(db);+ let paused = false;+ const spy = vi.spyOn(db, 'select').mockImplementation((fields) => {+ const query = select(fields);+ const from = query.from.bind(query);+ vi.spyOn(query, 'from').mockImplementation((table) => {+ const builder = from(table);+ if (table === messages && !paused) {+ const orderBy = builder.orderBy.bind(builder);+ vi.spyOn(builder, 'orderBy').mockImplementationOnce((...columns) => {+ paused = true;+ const snapshot = orderBy(...columns).all();+ captured();+ return resume.then(() => snapshot) as unknown as ReturnType<typeof orderBy>;+ });+ }+ return builder;+ });+ return query;+ });+ try {+ onAssistantTextEvent('s1', { text: '', agentMessageId: 'withdraw', isFinal: true, isFullText: true }, null);+ await snapshotTaken;+ const boundary = Date.now() + 1000;+ h.sqlite!.prepare('UPDATE sessions SET cleared_at = ? WHERE id = ?').run(boundary, 's1');+ noteSessionClearBoundary('s1', boundary);+ await prRefsStore.recomputePrRefsForSession('s1');+ expect(await prRefsStore.listPrRefs('s1')).toHaveLength(0);+ release();+ await drainPersistQueue();+ expect(await prRefsStore.listPrRefs('s1')).toHaveLength(0);+ } finally { release(); spy.mockRestore(); }+});diff --git a/apps/desktop/src/main/localDb/ipc/messages.ts b/apps/desktop/src/main/localDb/ipc/messages.tsindex 749861b4bb..5c612d31a2 100644--- a/apps/desktop/src/main/localDb/ipc/messages.ts+++ b/apps/desktop/src/main/localDb/ipc/messages.ts@@ -1491,7 +1491,9 @@ export async function discardPersistedAssistantMessage(if (result.changes === 0) return false;await pendingPrRefWrites.get(dbClient)?.get(row.id);if (isCurrent() && isOwnerBroadcastScopeCurrent(ownerScope)) {- await recomputePrRefsForSession(sessionId);+ await recomputePrRefsForSession(sessionId, {+ dbClient, isCurrent: () => isCurrent() && isOwnerBroadcastScopeCurrent(ownerScope),+ });}return true;}