Extend MCP tool with git-based management and intelligent merging

[nikomatsakis]

Extend MCP tool with git-based management and intelligent merging

Status: Planning

Current Understanding

Build on basic memory storage (#2) to add advanced lifecycle management. Implement store_back for updating existing memories, use git for version control and conflict detection, and create intelligent merge strategies for collaborative memory evolution.

Need to handle concurrent updates, provide merge/split/generalization options, and collaborate with user when automatic resolution isn't clear.

Next Steps

• Implement store_back tool for memory updates
• Add git-based storage backend for version control
• Create conflict detection mechanism for concurrent updates
• Design merge strategies (additive, generalization, splitting, error correction)
• Implement user collaboration flow for ambiguous conflicts
• Add memory evolution patterns (context broadening, error correction)
• Test with real collaboration scenarios

Open Questions

• Git integration approach: individual files or single JSON database?
• How much automatic merging vs user involvement for conflicts?
• Should memory splitting/generalization be automatic or guided?
• How to track memory lineage and evolution history?

Context

Builds on #2 to enable memory evolution over time. As understanding deepens, memories need updating, correcting, and refining. Git provides version control and conflict detection, while intelligent merging preserves collaborative insights. Critical for team scenarios where multiple people contribute to shared knowledge.