fix review findings for session queries

This commit is contained in:
Hypatia May
2026-07-24 15:58:03 +08:00
parent bc47884a77
commit 01b70fd6fd
4 changed files with 58 additions and 11 deletions

View File

@@ -658,13 +658,10 @@ async function collectPages<T>(
signal.throwIfAborted()
for (const item of page.items) {
if (!accept(item)) continue
items.push(item)
if (items.length === maxResults) {
return {
items,
capped: page.nextCursor !== undefined || item !== page.items.at(-1),
}
return { items, capped: true }
}
items.push(item)
}
if (page.nextCursor === undefined) return { items, capped: false }
if (seen.has(page.nextCursor)) {

View File

@@ -506,8 +506,10 @@ describe('search paging, prior-history bounds, titles, and cancellation', () =>
})
}
return Promise.resolve({
items: [sessionHit('b', '/work', 'second')],
nextCursor: SessionSearchCursor('more'),
items: [
sessionHit('b', '/work', 'second'),
sessionHit('additional-authorized', '/work', 'third'),
],
})
}
@@ -523,6 +525,27 @@ describe('search paging, prior-history bounds, titles, and cancellation', () =>
expect(output).toContain('Result cap reached')
})
it('does not report a cap when only rejected hits remain after the authorized limit', async () => {
const mounted = await mount({ maxSearchResults: 1 })
const cursor = SessionSearchCursor('rejected-tail')
FakeQuery.sessionSearch = request => request.cursor === undefined
? Promise.resolve({
items: [sessionHit('authorized', '/work')],
nextCursor: cursor,
})
: Promise.resolve({
items: [
sessionHit(mounted.caller.id, '/work'),
sessionHit('outside', '/outside'),
],
})
const output = text(await mounted.call('session_search', { query: 'needle' }))
expect(FakeQuery.sessionRequests.map(request => request.cursor)).toEqual([undefined, cursor])
expect(output).toContain('Session authorized')
expect(output).not.toContain('Result cap reached')
})
it('preserves stale-cursor diagnostics without transparently restarting', async () => {
const mounted = await mount({ maxSearchResults: 2 })
const cursor = SessionSearchCursor('stale-next')