mirror of
https://github.com/akitaonrails/ai-memory.git
synced 2026-10-02 03:24:46 +08:00
Forward-merge of the nine PRs that landed on main (the 2.0.4 batch: #642 auth stale-bearer, #646/#640 LoginLimiter, #644 Cursor attribution, #650/#647 reindex manifest, #638 MCP routing, #652 CI docs, #645 dev-loop/build) into the 2.1 feature train, so release/2.1 carries every fix before 2.1.0 is cut. Conflicts resolved: - crates/ai-memory-wiki/src/wiki.rs: 2.1's per-page write lock (page_locks, #607) and main's manifested_scopes memo (#650) are independent additions to the same struct/imports/constructor — kept both; imports merged to {HashMap, HashSet}. - CHANGELOG.md: [Unreleased] now carries 2.1's ### Added features above main's ### Changed + ### Fixed (the 2.0.4 fixes), Keep-a-Changelog order, single [2.0.3] section preserved. - crates/ai-memory-llm/tests/extra_headers_on_the_wire.rs (2.1's #606 test) relocated into tests/suite/ and declared in mod.rs to satisfy #645's one-test-binary-per-crate harness convention (caught by the repo_layout guard). fmt, clippy -D warnings, llm harness, and the repo_layout guard all green.