Skip to content

Garry's Opinionated OpenClaw/Hermes Agent Brain

TypeScript

Keyword search labels a row found only under another name the same way on every page

garrytan910893aede31
diff --git a/src/core/ops/search.ts b/src/core/ops/search.ts
index 9fb4654f48..949607c2dc 100644
--- a/src/core/ops/search.ts
+++ b/src/core/ops/search.ts
@@ -753,11 +753,14 @@ const search: Operation = {
const keywordOpts = { ...readOpts, source_boosts: sourceBoosts, keywordPhrase, ...(types ? { types } : {}) };
// F2 `match: "keyword"`: page-grain enumeration, no diversity pruning, every page keeps a row.
// A query that is one entity's name lists records filed under any of its names (the agent no longer walks each alias).
- const names = paging.match === 'keyword' && !paging.cursor ? await setup(() => wholeQueryEntityNames(ctx.engine, queryText, { ...scope, excludePrivate })) : null;
- const pageParams = names ? { ...p, query: names.map(aliasPhrase).join(' OR ') } : p;
- const page = paging.match === 'keyword' ? await timings.stage('lexical', () => readKeywordPage(ctx.engine, pageParams, keywordOpts, paging, Math.min(limit, searchLimitCap()))) : null;
+ // A cursor page's query is already the first page's OR of names; the cursor carries the names for matched_alias.
+ const names = paging.match !== 'keyword' ? null
+ : paging.cursor ? paging.cursor.names ?? null
+ : await setup(() => wholeQueryEntityNames(ctx.engine, queryText, { ...scope, excludePrivate }));
+ const pageParams = names && !paging.cursor ? { ...p, query: names.map(aliasPhrase).join(' OR ') } : p;
+ const page = paging.match === 'keyword' ? await timings.stage('lexical', () => readKeywordPage(ctx.engine, pageParams, keywordOpts, paging, Math.min(limit, searchLimitCap()), names)) : null;
if (page && names) {
- page.meta.match_names = names;
+ if (!paging.cursor) page.meta.match_names = names;
for (const row of page.rows) {
const text = (row.chunk_text ?? '').toLowerCase();
const hit = names.slice(1).find(n => text.includes(n.toLowerCase()));
diff --git a/src/core/search/keyword-paging.ts b/src/core/search/keyword-paging.ts
index a49ceeab4e..6a57610163 100644
--- a/src/core/search/keyword-paging.ts
+++ b/src/core/search/keyword-paging.ts
@@ -46,7 +46,8 @@ export const KEYWORD_COUNT_GRACE_MS = 250;
/** Params a keyword `next` carries over unchanged. */
const CARRIED_PARAMS = ['limit', 'types', 'source_id', 'snippet_chars', 'return_unit', 'return_window', 'token_budget', 'fields'] as const;
-interface KeywordCursor extends KeywordPageAfter { shown: number }
+/** `names`: the entity names a first page ORed into the query, so later pages still mark rows found only under another name. */
+interface KeywordCursor extends KeywordPageAfter { shown: number; names?: string[] }
export interface SearchPaging { match: SearchMatch; offset: number; cursor: KeywordCursor | null }
@@ -55,16 +56,17 @@ function fingerprint(p: Record<string, unknown>): string {
return createHash('sha256').update(JSON.stringify([p.query, p.types ?? null, p.source_id ?? null])).digest('base64url').slice(0, 12);
}
-function encodeCursor(after: KeywordPageAfter, shown: number, p: Record<string, unknown>): string {
- return Buffer.from(JSON.stringify({ v: 1, s: after.score, p: after.page_id, n: shown, f: fingerprint(p) })).toString('base64url');
+function encodeCursor(after: KeywordPageAfter, shown: number, p: Record<string, unknown>, names: string[] | null): string {
+ return Buffer.from(JSON.stringify({ v: 1, s: after.score, p: after.page_id, n: shown, f: fingerprint(p), ...(names ? { m: names } : {}) })).toString('base64url');
}
function decodeCursor(raw: string, p: Record<string, unknown>): KeywordCursor | 'mismatch' | null {
try {
- const c = JSON.parse(Buffer.from(raw, 'base64url').toString('utf8')) as { v?: unknown; s?: unknown; p?: unknown; n?: unknown; f?: unknown };
+ const c = JSON.parse(Buffer.from(raw, 'base64url').toString('utf8')) as { v?: unknown; s?: unknown; p?: unknown; n?: unknown; f?: unknown; m?: unknown };
if (c.v !== 1 || typeof c.s !== 'number' || !Number.isFinite(c.s) || !Number.isInteger(c.p) || !Number.isInteger(c.n) || (c.n as number) < 0) return null;
if (c.f !== fingerprint(p)) return 'mismatch';
- return { score: c.s, page_id: c.p as number, shown: c.n as number };
+ const names = Array.isArray(c.m) && c.m.length > 1 && c.m.length <= 16 && c.m.every(n => typeof n === 'string') ? c.m as string[] : undefined;
+ return { score: c.s, page_id: c.p as number, shown: c.n as number, ...(names ? { names } : {}) };
} catch {
return null;
}
@@ -177,7 +179,7 @@ export interface KeywordPage {
* One `match: "keyword"` page: limit + 1 rows probe `truncated` (so `next`
* never depends on the count), the count runs beside them.
*/
-export async function readKeywordPage(engine: BrainEngine, p: Record<string, unknown>, opts: SearchOpts, paging: SearchPaging, limit: number): Promise<KeywordPage> {
+export async function readKeywordPage(engine: BrainEngine, p: Record<string, unknown>, opts: SearchOpts, paging: SearchPaging, limit: number, names: string[] | null = null): Promise<KeywordPage> {
const queryText = String(p.query);
const [probe, count] = await Promise.all([
engine.searchKeywordPages(queryText, opts, { limit: limit + 1, ...(paging.cursor ? { after: paging.cursor } : { offset: paging.offset }) }),
@@ -191,7 +193,7 @@ export async function readKeywordPage(engine: BrainEngine, p: Record<string, unk
if (truncated && last) {
next = { query: queryText, match: 'keyword' };
for (const key of CARRIED_PARAMS) if (p[key] !== undefined) next[key] = p[key];
- next.cursor = encodeCursor({ score: last.score, page_id: last.page_id }, start + rows.length, p);
+ next.cursor = encodeCursor({ score: last.score, page_id: last.page_id }, start + rows.length, p, names);
}
const counted = 'unavailable' in count ? null : count;
const degraded = counted ? undefined : keywordCountMeta(count, 0).degraded;
diff --git a/test/search-alias-fanout.test.ts b/test/search-alias-fanout.test.ts
index 2416222989..eb691999bf 100644
--- a/test/search-alias-fanout.test.ts
+++ b/test/search-alias-fanout.test.ts
@@ -112,6 +112,24 @@ describe('alias fan-out', () => {
expect(plain.content.map(c => c.text ?? '').join('\n')).not.toContain('any of this entity');
});
+ test('match: "keyword" labels a row found only under another name the same way on every page (GBRA-449)', async () => {
+ await account();
+ const seen: Array<{ slug: string; evidence?: string; matched_alias?: string; page: number }> = [];
+ let page: Record<string, unknown> | undefined = { query: 'Widget Co', match: 'keyword', limit: 3 };
+ for (let n = 0; page; n++) {
+ const r = await dispatchToolCall(engine, 'search', page, remote as never);
+ for (const row of JSON.parse(r.content[0].text!) as Array<{ slug: string; evidence?: string; matched_alias?: string }>) seen.push({ ...row, page: n });
+ page = (r._meta?.retrieval as { next?: Record<string, unknown> }).next;
+ }
+ const aliasOnly = seen.filter(r => r.slug === 'tickets/t1' || r.slug === 'contracts/a1');
+ expect(aliasOnly.map(r => r.slug).sort()).toEqual(['contracts/a1', 'tickets/t1']);
+ expect(aliasOnly.some(r => r.page > 0)).toBe(true);
+ for (const r of aliasOnly) {
+ expect(r.matched_alias).toBeDefined();
+ expect(r.evidence).toBe('weak_semantic');
+ }
+ });
+
test('search.alias_fanout_max=0 turns fan-out off', async () => {
await account();
await engine.setConfig('search.alias_fanout_max', '0');