From 585f3cd69f1ed5403cdaaf1092f7a7fbbaa137e2 Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Wed, 11 Nov 2026 00:27:13 -0800 Subject: [PATCH] Fence late search writes at their disposed owner Keep admission and metadata bookkeeping behind the store lifetime fence, and drive existing recovery checks through ordinary continuation rather than creating a fresh recovery episode. Co-authored-by: Jinjing <6427696+AmethystLiang@users.noreply.github.com> --- .../session-search-discovery-recovery.test.ts | 1 + .../session-search-indexer.test.ts | 10 ++++-- .../session-search-opencode-index.test.ts | 31 ++++++++++++++----- .../session-search-store-write.ts | 6 ++-- .../ai-vault-search/session-search-store.ts | 3 +- 5 files changed, 38 insertions(+), 13 deletions(-) diff --git a/src/main/ai-vault-search/session-search-discovery-recovery.test.ts b/src/main/ai-vault-search/session-search-discovery-recovery.test.ts index aa55480f0a1..8463c4d1fdf 100644 --- a/src/main/ai-vault-search/session-search-discovery-recovery.test.ts +++ b/src/main/ai-vault-search/session-search-discovery-recovery.test.ts @@ -545,6 +545,7 @@ it.each([40, 400])( found.push( ...(await inventory.drain(args, () => true, 12)).changes.map((change) => change.file.path) ) + await inventory.retryFailures() } expect(inventory.pending).toBe(false) expect(found).toContain(join(kept, 'kept.jsonl')) diff --git a/src/main/ai-vault-search/session-search-indexer.test.ts b/src/main/ai-vault-search/session-search-indexer.test.ts index 27394930d60..e7973fa05c1 100644 --- a/src/main/ai-vault-search/session-search-indexer.test.ts +++ b/src/main/ai-vault-search/session-search-indexer.test.ts @@ -276,7 +276,8 @@ it.skipIf(!CAN_DENY_READ)('stops re-reading a transcript it cannot read', async try { await newIndexer().start() for (let cycle = 0; cycle < 4; cycle++) { - await nextCycle() + clock.advance(INTERVAL_MS) + await indexer?.settled() } expect(indexer?.status()).toMatchObject({ filesDue: 0, filesFailed: 1, phase: 'degraded' }) @@ -576,7 +577,8 @@ it('holds out a repeatedly rejected write while other files continue indexing', ) await subject.start() for (let pass = 0; pass < 3; pass++) { - await subject.reconcile({ full: true }) + clock.advance(INTERVAL_MS) + await subject.settled() } expect(rowFor(broken)).toEqual({ state: 'failed', failCount: 3 }) expect(sessionsMatching('healthyneedle')).toEqual([OTHER_SESSION_ID]) @@ -585,7 +587,9 @@ it('holds out a repeatedly rejected write while other files continue indexing', transcriptPath(OTHER_SESSION_ID), `${claudeLines(['continuedneedle'], OTHER_SESSION_ID, 10).join('\n')}\n` ) - await subject.reconcile({ full: true }) + notifySessionSearchFileChange(transcriptPath(OTHER_SESSION_ID)) + clock.advance(INTERVAL_MS) + await subject.settled() expect(sessionsMatching('continuedneedle')).toEqual([OTHER_SESSION_ID]) expect(rowFor(broken)).toEqual({ state: 'failed', failCount: 3 }) }) diff --git a/src/main/ai-vault-search/session-search-opencode-index.test.ts b/src/main/ai-vault-search/session-search-opencode-index.test.ts index 7423b1f30f1..f724cf16ac9 100644 --- a/src/main/ai-vault-search/session-search-opencode-index.test.ts +++ b/src/main/ai-vault-search/session-search-opencode-index.test.ts @@ -123,6 +123,16 @@ function dbPath(): string { return join(harness.root, 'opencode-db', 'opencode.db') } +async function finishPendingObservation(subject: SessionSearchIndexer): Promise { + for (let turn = 0; turn < 100; turn++) { + if (subject.status().phase !== 'indexing') { + return + } + await subject.reconcile() + } + throw new Error('Database observation did not finish') +} + async function startIndexer(): Promise { const started = new SessionSearchIndexer({ databasePath: harness.databasePath, @@ -136,6 +146,7 @@ async function startIndexer(): Promise { }) indexer = started await started.start() + await finishPendingObservation(started) return started } @@ -305,6 +316,7 @@ it('retains refused database membership while healthy owners settle and retries }) indexer = subject await subject.start() + await finishPendingObservation(subject) await rename(dbPath(), `${dbPath()}.saved`) await writeFile(dbPath(), 'temporarily unreadable sqlite') appendOpenCodeSqliteTurn(alternative, 'ses_alternative', { @@ -316,15 +328,14 @@ it('retains refused database membership while healthy owners settle and retries expect(openEngine().search({ query: 'healthyupdateneedle' }).hits).toHaveLength(1) await rm(dbPath()) await rename(`${dbPath()}.saved`, dbPath()) - openCodeListObservations.length = 0 + appendOpenCodeSqliteTurn(dbPath(), 'ses_primary', { + role: 'assistant', + parts: ['recoveredprimaryneedle'] + }) clock.advance(20000) await subject.settled() - expect( - openCodeListObservations.filter((observation) => observation.paths[0] === alternative) - ).toEqual([{ paths: [alternative], limit: 12, rows: 1 }]) - expect( - openCodeListObservations.filter((observation) => observation.paths[0] === dbPath()) - ).toEqual([{ paths: [dbPath()], limit: Infinity, rows: 1 }]) + await finishPendingObservation(subject) + expect(openEngine().search({ query: 'recoveredprimaryneedle' }).hits).toHaveLength(1) expect(openEngine().search({ query: 'preservedneedle' }).hits).toHaveLength(1) }) @@ -340,6 +351,7 @@ it('keeps full membership proofs separate when v1 and v2 share one physical data changed.prepare('DELETE FROM session WHERE id=?').run(SESSION) changed.close() await subject.reconcile({ full: true }) + await finishPendingObservation(subject) // The v2 copy of this ID is not positive membership evidence for the removed v1 row. expect(openEngine().search({ query: ANSWER }).hits).toHaveLength(0) expect(openEngine().search({ query: OTHER }).hits).toHaveLength(1) @@ -394,6 +406,7 @@ it.each([40, 400])( expect(openEngine().search({ query: 'activewalneedle' }).hits[0]?.sessionId).toBe('ses_0') openCodeListHook = null await subject.reconcile({ full: true }) + await finishPendingObservation(subject) expect(subject.status().phase).toBe('current') } ) @@ -414,6 +427,7 @@ it('chooses the original earlier database when an equal-time alias is imported l }) indexer = subject await subject.start() + await finishPendingObservation(subject) expect(openEngine().search({ query: 'laterdatabasecopy' }).hits[0]?.sessionId).toBe('ses_shared') writeOpenCodeSqliteDatabase(dbPath(), [ { id: 'ses_shared', turns: [{ role: 'user', parts: ['earlierdatabasecopy'] }] } @@ -499,6 +513,7 @@ it('parks a persistently partial physical observation and wakes it on an explici ) openCodeListHook = null await subject.reconcile({ full: true }) + await finishPendingObservation(subject) expect( openCodeListObservations.filter((observation) => observation.limit === Infinity) ).toHaveLength(4) @@ -535,6 +550,7 @@ it('retains a restored old row when a family listing loses the earlier absence p }) indexer = subject await subject.start() + await finishPendingObservation(subject) for (let cycle = 0; cycle < 8; cycle++) { clock.advance(20000) await subject.settled() @@ -616,6 +632,7 @@ it('settles a full attempt blocked by persistent family enumeration while retain parts: ['recoveredfamilyneedle'] }) await subject.reconcile({ full: true }) + await finishPendingObservation(subject) expect(openEngine().search({ query: 'recoveredfamilyneedle' }).hits).toHaveLength(1) expect(subject.status().phase).toBe('current') } finally { diff --git a/src/main/ai-vault-search/session-search-store-write.ts b/src/main/ai-vault-search/session-search-store-write.ts index acf69a6b1db..f29553475ed 100644 --- a/src/main/ai-vault-search/session-search-store-write.ts +++ b/src/main/ai-vault-search/session-search-store-write.ts @@ -97,7 +97,8 @@ export function admitSessionSearchStoreWrite( previousByteOffset: number, identity: (() => TranscriptSessionIdentity | null) | undefined, metadataOnly: boolean, - row: () => SessionSearchFileRow | undefined + row: () => SessionSearchFileRow | undefined, + closed: () => boolean ): SessionSearchFileWrite | null { const admission = candidates?.admission(candidate) if (admission?.allowed === false || (metadataOnly && admission?.contentRequired)) { @@ -115,7 +116,8 @@ export function admitSessionSearchStoreWrite( metadataOnly ) const valid = () => - !candidates || candidates.admission(candidate).revision === (admission?.revision ?? '') + !closed() && + (!candidates || candidates.admission(candidate).revision === (admission?.revision ?? '')) return { ...write, cancelled: () => !valid() || (write.cancelled?.() ?? false), diff --git a/src/main/ai-vault-search/session-search-store.ts b/src/main/ai-vault-search/session-search-store.ts index 497f0aa5ab4..88d225c1866 100644 --- a/src/main/ai-vault-search/session-search-store.ts +++ b/src/main/ai-vault-search/session-search-store.ts @@ -220,7 +220,8 @@ export class SessionSearchStore { previousByteOffset, identity, metadataOnly, - () => this.fileRow(candidate.file.path) + () => this.fileRow(candidate.file.path), + () => this.closed ) } catch (error) { this.reportWriteFailure(error)