fix(search): quote underscored terms in FTS5 query sanitization - #16765
Closed
crayfish-ai wants to merge 4 commits into
Closed
fix(search): quote underscored terms in FTS5 query sanitization#16765crayfish-ai wants to merge 4 commits into
crayfish-ai wants to merge 4 commits into
Conversation
added 4 commits
April 23, 2026 17:30
- holographic/__init__.py: 并行FTS+HRR双路检索，2s timeout，score fusion取top5 - holographic/retrieval.py: FTS查询改用OR+前缀匹配，支持中文单字分词和英文前缀 - holographic/store.py: 新增remove_fact_by_content()按内容删除fact - run_agent.py: memory bridge增加remove action，传递deleted_entry给外置provider - tools/memory_tool.py: remove返回被删entry内容 - agent/memory_manager.py: 文档澄清BuiltinMemoryProvider不走插件系统 - agent/auxiliary_client.py: MiniMax custom endpoint的base_url补充_to_openai_base_url转换 - whatsapp-bridge/package-lock.json: 依赖锁文件更新 - docs/memory-providers.md: honcho_sync工具文档更新
…rite - resolve_provider_client: apply _to_openai_base_url() to custom base_url (fixes /anthropic → /v1 rewrite that was missing for provider="custom") - resolve_provider_client: use main_runtime["model"] instead of _read_main_model() so auxiliary tasks follow system default changes - title_generator: thread main_runtime through generate_title → auto_title_session → maybe_auto_title (both CLI and gateway call sites) - flush_memories (run_agent.py): pass main_runtime to call_llm so it uses the same model as the main conversation - update test assertion to match new auto_title_session signature
The /restart command triggered a drain that waited for ALL agents including the caller agent itself, which was waiting for the HTTP response — creating a deadlock that always timed out after 60 seconds. Changes: - _drain_active_agents(): add exclude_key param to filter out the caller - _interrupt_running_agents(): add exclude_key param to skip the caller - _stop_impl(): pass _restart_caller_key to both functions - _handle_restart_command(): record caller's session_key before draining - GatewayRunner.__init__: initialize _restart_caller_key Test update: - tests/gateway/restart_test_helpers.py: add _restart_caller_key to runner setup - tests/gateway/test_clean_shutdown_marker.py: add _restart_caller_key to runner
FTS5 default tokenizer splits 'sp_new1' into tokens 'sp' and 'new1'.
Without quoting, a search for 'sp_new' becomes an AND query
('sp AND new') that fails to match rows indexed as 'sp_new1'.
Fix: add underscore to the character class in Step 5 regex
([.-] -> [._-]) so underscored terms are wrapped in double quotes.
Also adds test_sanitize_fts5_quotes_underscored_terms.
alt-glitch
added
type/bug
Contributor
Author
|
Recreated as fix-fts5-v3 on current upstream/main |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
FTS5 default tokenizer splits 'sp_new1' into tokens 'sp' and 'new1'. Without quoting, a search for 'sp_new' becomes an AND query ('sp AND new') that fails to match rows indexed as 'sp_new1'.
Fix
Add underscore to the character class in Step 5 regex ([.-] -> [._-]) so underscored terms are wrapped in double quotes and treated as exact phrases.
Test
Files changed
Scope note
This PR contains only the 2 files necessary for the fix. Previous PR #16755 had a large diff due to branch contamination.