Skip to content

Solution for long term memory for agent coding CLIs and to facilitate handoff between different agent vendors

Rust

fix(admin): complete the merge-conflict test helper and changelog entry

AkitaOnRails9978e4369283
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91471f37..66e4e6e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
### Fixed
+- Merging a project no longer reports a spurious content conflict when
+ the only difference is `generated.at`: the merge comparison now uses
+ the same modulo-timestamp projection as the store's idempotency rule.
+ The old raw comparison made conflict detection timing-dependent — the
+ identical page re-written across a second boundary 409'd as
+ "different content" (the `copy_purge_rerun_is_idempotent` flake,
+ root-caused via its diagnosable failure body on the Windows matrix
+ run and now pinned by a deterministic cross-boundary test).
- `install-hooks` now writes the capture-mode opt-in atomically. It was
written in place, and every reader maps an unrecognised value onto
`denylist` — the less private mode — so a crash, a full disk or a killed
diff --git a/crates/ai-memory-mcp/src/admin.rs b/crates/ai-memory-mcp/src/admin.rs
index 3e9e4768..c7e8b116 100644
--- a/crates/ai-memory-mcp/src/admin.rs
+++ b/crates/ai-memory-mcp/src/admin.rs
@@ -4684,6 +4684,7 @@ mod page_copy_differs_tests {
body: body.into(),
frontmatter_json: fm.to_string(),
tier: "semantic".into(),
+ pinned: false,
}
}