Skip to content

sync: merge main into release/3.2.0 (preserve history)#764

Merged
igorls merged 5 commits intorelease/3.2.0from
sync/main-into-release-3.2.0
Apr 13, 2026
Merged

sync: merge main into release/3.2.0 (preserve history)#764
igorls merged 5 commits intorelease/3.2.0from
sync/main-into-release-3.2.0

Conversation

@igorls
Copy link
Copy Markdown
Member

@igorls igorls commented Apr 13, 2026

Why another sync PR

PR #763 resolved the content divergence between main and release/3.2.0 — but it was squash-merged, which collapsed main's history into a single unrelated commit. GitHub still sees main and release/3.2.0 as divergent, so PR #762 (release/3.2.0 → main) remains marked CONFLICTING even though the file contents match.

This PR re-does the sync as a true merge commit so that release/3.2.0 becomes a proper descendant of main.

⚠️ MERGE INSTRUCTIONS

When merging this PR, click the dropdown arrow next to the green button and choose "Create a merge commit". Do NOT squash. Squashing will erase main's ancestry again and we'll be back to the same problem.

Conflicts resolved

Verification

  • git log --oneline origin/main ^HEAD — empty (main fully contained)
  • After merge with "Create a merge commit", PR release: v3.2.0 #762 becomes MERGEABLE

z3tz3r0 and others added 5 commits April 11, 2026 23:06
Replace "your memory system" with explicit MemPalace references and
tool names (mempalace_diary_write, mempalace_add_drawer, mempalace_kg_add)
in stop and precompact hook block reasons. This prevents Claude Code from
misinterpreting the hook as a native auto-memory save instruction.

Updated in both Python (hooks_cli.py) and standalone shell scripts.

Also fix CONTRIBUTING.md Getting Started to show the fork-first workflow,
matching the PR Guidelines section.
The current constraint `chromadb>=0.5.0,<0.7` forces pip to install
chromadb 0.6.x, but palaces created with chromadb 1.x (which is what
the mempalace dev environment actually uses — 1.5.7 per uv.lock) have
an incompatible SQLite schema. Specifically, chromadb 0.6.x fails with
`KeyError: '_type'` when opening a collection written by 1.x.

This means a fresh `pip install mempalace` gives users a chromadb
version that cannot read palaces created in the maintainer's own
environment. The fix removes the upper bound so pip can resolve to the
current stable chromadb release.

Reproduction:
  python3 -m venv .venv && source .venv/bin/activate
  pip install mempalace          # installs chromadb 0.6.3
  # Try opening a palace created with chromadb 1.x:
  # -> _get_collection() returns None, tool_status() returns "No palace found"
  pip install chromadb==1.5.7    # force upgrade
  # -> tool_status() returns real data (26k drawers in our case)
fix: remove chromadb <0.7 upper bound — blocks 1.x installs
@igorls igorls merged commit 2a56940 into release/3.2.0 Apr 13, 2026
@igorls igorls deleted the sync/main-into-release-3.2.0 branch April 13, 2026 06:48
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.

4 participants