Skip to content

chore: resolve main into staging conflicts - #388

Closed
suguanYang wants to merge 41 commits into
stagingfrom
fix/wangbinqi/resolve-staging-main-conflicts
Closed

chore: resolve main into staging conflicts#388
suguanYang wants to merge 41 commits into
stagingfrom
fix/wangbinqi/resolve-staging-main-conflicts

Conversation

@suguanYang

Copy link
Copy Markdown
Contributor

Resolves the current mainstaging merge conflicts for PR #387.

  • Preserves both the content-trigram and map-unit migration contract tests.
  • Adds Alembic merge revision d3e4f5a6b7c8 so the two retrieval-index migration branches converge to one head.
  • Includes the main changes on top of the current staging branch.

Validation: cd apps/api && uv run python -m pytest tests/migrations/test_schema_contract.py -q (16 passed).`

suguanYang and others added 30 commits September 1, 2026 21:23
fix(retrieval): enable production node filter
…-cache

perf(retrieval): optimize map-nav snapshot and scoring
Replace character-level CJK tokenization with the shared jieba path and
bump map-unit index format to v2 so query hashes match stored tokens.
Add --tokens-only/--skip-current-format for lightweight reindex after
tokenizer changes without rebuilding manifests or namespace snapshots.

Co-authored-by: Cursor <cursoragent@cursor.com>
…nit-tokens

feat(retrieval): word-level map-unit BM25 tokens
…ew evidence text rendering

Deleted the legacy evidence rendering functionality and tests. Introduced a new method for rendering evidence text that groups documents and sections more effectively. Updated related components to utilize the new rendering approach.
…sset-inline

feat(retrieval): unify evidence text and placeholder asset inline
@suguanYang

Copy link
Copy Markdown
Contributor Author

Closing this PR because the repository workflow uses main as the base branch. A corrected staging-to-main PR will replace it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants