Skip to content

Add memory conflict review workflow - #1

Merged
macayu17 merged 7 commits into
mainfrom
feature/memory-conflicts
Jul 18, 2026
Merged

Add memory conflict review workflow#1
macayu17 merged 7 commits into
mainfrom
feature/memory-conflicts

Conversation

@macayu17

Copy link
Copy Markdown
Owner

Summary

  • preserve memory revisions before automatic replacements
  • route ambiguous contradictions into pending conflict proposals
  • add transactional conflict resolution and dashboard review controls

Why

Engram previously replaced selected memories in place when reconciliation returned UPDATE, which could silently erase a still-valid durable claim. This keeps clear corrections automatic while holding genuine conflicts out of retrieval until the user resolves them.

Impact

Unresolved proposals remain pending and excluded from approved-only retrieval. Users can accept the new claim, keep the current claim, or keep both from the Memories dashboard. No Azure, Docker, deployment, model, or environment configuration changes are included.

Validation

  • F:\Engram\.venv\Scripts\python.exe -m pytest api -q (162 passed, 3 skipped)
  • npm run typecheck
  • npm run verify:logic
  • npm run verify:conflicts
  • npm run build
  • docker compose config --quiet

@vercel

vercel Bot commented Jul 18, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
engram Ready Ready Preview, Comment Jul 18, 2026 2:30pm

@macayu17
macayu17 marked this pull request as ready for review July 18, 2026 17:31
Copilot AI review requested due to automatic review settings July 18, 2026 17:31
@macayu17
macayu17 merged commit e18a100 into main Jul 18, 2026
8 checks passed

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

@macayu17
macayu17 deleted the feature/memory-conflicts branch July 18, 2026 17:36
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