fix: apply 5 fleet-wide bug fixes (dedup, wildcard, doc-id, fallback, metadata) (#10)
- Add deduplicateResults() to search-legislation and build-legal-stance - Upgrade fts-query with stemming, boolean passthrough, LIKE fallback, OR tier - Use resolveDocumentId() for document_id parameter in search tools - Disclose query_strategy and note in metadata on broadened/failed queries - Add note and query_strategy optional fields to ResponseMetadata interface Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -4,49 +4,115 @@
|
||||
* Handles query sanitization and variant generation for SQLite FTS5.
|
||||
*/
|
||||
|
||||
const FTS5_BOOLEAN_OPS = /\b(AND|OR|NOT)\b/;
|
||||
|
||||
/**
|
||||
* Detect whether input contains FTS5 boolean operators.
|
||||
*/
|
||||
export function hasBooleanOperators(input: string): boolean {
|
||||
return FTS5_BOOLEAN_OPS.test(input);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sanitize user input for safe FTS5 queries.
|
||||
* Removes characters that have special meaning in FTS5 syntax.
|
||||
* Preserves boolean operators (AND, OR, NOT) when detected.
|
||||
*/
|
||||
export function sanitizeFtsInput(input: string): string {
|
||||
if (hasBooleanOperators(input)) {
|
||||
// Preserve boolean structure: only strip dangerous chars, keep quotes and parens
|
||||
return input.replace(/[{}[\]^~*:]/g, ' ').replace(/\s+/g, ' ').trim();
|
||||
}
|
||||
// Preserve trailing * on words (FTS5 prefix search) but strip other special chars
|
||||
return input
|
||||
.replace(/['"(){}[\]^~*:]/g, ' ')
|
||||
.replace(/['"(){}[\]^~:]/g, ' ')
|
||||
.replace(/\*(?!\s|$)/g, ' ') // strip * unless at end of word
|
||||
.replace(/\s+/g, ' ')
|
||||
.trim();
|
||||
}
|
||||
|
||||
/**
|
||||
* Truncate common English suffixes for stemming fallback.
|
||||
* Returns stem + "*" ready string, or null if no stemming possible.
|
||||
*/
|
||||
function stemWord(word: string): string | null {
|
||||
if (word.length < 5) return null;
|
||||
const lower = word.toLowerCase();
|
||||
for (const suffix of [
|
||||
'ies', 'ing', 'ers', 'tion', 'ment', 'ness',
|
||||
'able', 'ible', 'ous', 'ive', 'ed', 'es', 'er', 'ly', 's',
|
||||
]) {
|
||||
if (lower.endsWith(suffix) && lower.length - suffix.length >= 3) {
|
||||
return lower.slice(0, -suffix.length);
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Build FTS5 query variants for a search term.
|
||||
* Returns variants in order of specificity (most specific first):
|
||||
* 1. Exact phrase match
|
||||
* 2. All terms required (AND)
|
||||
* 3. Prefix match on last term
|
||||
* 3. Prefix AND (last term gets prefix wildcard)
|
||||
* 4. Stemmed prefix (suffix-truncated + wildcard)
|
||||
* 5. Any term matches (OR) — broad fallback
|
||||
*
|
||||
* When boolean operators are detected, passes query through as-is.
|
||||
*/
|
||||
export function buildFtsQueryVariants(sanitized: string): string[] {
|
||||
if (!sanitized || sanitized.trim().length === 0) {
|
||||
return [];
|
||||
}
|
||||
|
||||
// Boolean passthrough — user knows what they want
|
||||
if (hasBooleanOperators(sanitized)) {
|
||||
return [sanitized];
|
||||
}
|
||||
|
||||
const terms = sanitized.split(/\s+/).filter(t => t.length > 0);
|
||||
if (terms.length === 0) return [];
|
||||
|
||||
const variants: string[] = [];
|
||||
|
||||
// Exact phrase
|
||||
if (terms.length > 1) {
|
||||
// Exact phrase
|
||||
variants.push(`"${terms.join(' ')}"`);
|
||||
// AND query
|
||||
variants.push(terms.join(' AND '));
|
||||
// Prefix AND on last term
|
||||
variants.push([...terms.slice(0, -1), `${terms[terms.length - 1]}*`].join(' AND '));
|
||||
} else {
|
||||
// Single term
|
||||
variants.push(terms[0]);
|
||||
if (terms[0].length >= 3) {
|
||||
variants.push(`${terms[0]}*`);
|
||||
}
|
||||
}
|
||||
|
||||
// AND query
|
||||
variants.push(terms.join(' AND '));
|
||||
// Stemmed variant — truncate suffixes + wildcard
|
||||
const stemmedTerms = terms.map(t => {
|
||||
const stem = stemWord(t);
|
||||
return stem ? `${stem}*` : t;
|
||||
});
|
||||
if (stemmedTerms.some((s, i) => s !== terms[i])) {
|
||||
variants.push(stemmedTerms.join(' AND '));
|
||||
}
|
||||
|
||||
// Prefix match on last term (for autocomplete-like behavior)
|
||||
if (terms.length === 1 && terms[0].length >= 3) {
|
||||
variants.push(`${terms[0]}*`);
|
||||
} else if (terms.length > 1) {
|
||||
const prefix = [...terms.slice(0, -1), `${terms[terms.length - 1]}*`];
|
||||
variants.push(prefix.join(' AND '));
|
||||
// OR fallback — any term matches (broadest)
|
||||
if (terms.length > 1) {
|
||||
variants.push(terms.join(' OR '));
|
||||
}
|
||||
|
||||
return variants;
|
||||
}
|
||||
|
||||
/**
|
||||
* Build a SQL LIKE pattern from search terms.
|
||||
* Used as a final fallback when FTS5 returns no results.
|
||||
* Example: "penalty offence" -> "%penalty%offence%"
|
||||
*/
|
||||
export function buildLikePattern(query: string): string {
|
||||
const terms = query.trim().split(/\s+/).filter(t => t.length > 0);
|
||||
if (terms.length === 0) return '%';
|
||||
return `%${terms.join('%')}%`;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user