release: merge main into release/3.3.2#1052
Merged
igorls merged 7 commits intorelease/3.3.2from Apr 20, 2026
Merged
Conversation
release: sync develop → main (v3.3.0 manifest, SECURITY.md, version guard, Pages CNAME)
Bumps version across pyproject.toml, mempalace/version.py, README badge, and uv.lock. Finalizes the 3.3.0 CHANGELOG section (was still labeled 'Unreleased') and adds a 3.3.1 section covering the multi-language entity-detection infra and the five new locales landed since 2026-04-13. Highlights: - Multi-language entity detection infra (#911) + script-aware word boundaries for combining-mark scripts (#932) + BCP 47 case-insensitive locale resolution (#928) + i18n patterns wired into miner/palace/ entity_registry (#931) - Five new fully-supported locales: pt-br (#156), ru (#760), it (#907), hi (#773), id (#778) - UTF-8 encoding fix on read_text() calls for non-UTF-8 Windows locales (#946) - KnowledgeGraph lock correctness (#884, #887) - Various smaller fixes and improvements
Advisor caught: initial boundary (962776c..develop) skipped PRs that landed on develop after v3.3.0 tag but before the sync-back merge. Adds entries for #871 MEMPAL_VERBOSE, #811 research() local-only default, #866 init .gitignore, #864 MCP stdout redirect, #863 precompact hook, #865 searcher empty results, #831 cold-start palace, #862 init help, #815 Slack provenance, #840 save hook auto-mine. Also drops the awkward caveat on #846 created_at — it's post-v3.3.0.
version-guard workflow checks five sources must agree: mempalace/version.py, pyproject.toml, .claude-plugin/marketplace.json, .claude-plugin/plugin.json, .codex-plugin/plugin.json. Initial release commit missed the three plugin manifests.
…ests release: bump plugin manifests to 3.3.1
release: v3.3.1
Conflicts resolved by taking the 3.3.2 side for all version files: - pyproject.toml, mempalace/version.py (3.3.2) - .claude-plugin/marketplace.json, .claude-plugin/plugin.json (3.3.2) - .codex-plugin/plugin.json (3.3.2) - README.md version badge (3.3.2) - uv.lock (3.3.2) - CHANGELOG.md keeps [3.3.2] section on top of main's [3.3.1] No source-code conflicts; main's 3.3.1 commit footprint is already in develop's history via the earlier sync boundaries. 1033 tests pass on the merged tree.
Contributor
There was a problem hiding this comment.
Copilot wasn't able to review any files in this pull request.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
Solved |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolves the conflicts on #1041.
mainis ahead ofrelease/3.3.2by the v3.3.1 release commits (bumps, plugin-manifest follow-ups, and the CHANGELOG hygiene that was never back-merged to develop). This PR pullsmainintorelease/3.3.2so #1041 can merge cleanly.Conflict resolution
All 8 conflicts were version-bump collisions between the two versioned states. Resolved to keep 3.3.2 in every case:
pyproject.toml→3.3.2mempalace/version.py→3.3.2.claude-plugin/marketplace.json→3.3.2.claude-plugin/plugin.json→3.3.2.codex-plugin/plugin.json→3.3.2README.mdversion badge →3.3.2uv.lock→3.3.2CHANGELOG.mdkeeps the[3.3.2] — 2026-04-19section on top of main's[3.3.1] — 2026-04-16(the release branch already took main's post-3.3.1 CHANGELOG as its base, so there's no lost content from main)No source-code conflicts. All tests pass on the merged tree (
uv run python -m pytest tests/ --ignore=tests/benchmarks -q→ 1033 passed).After this merges into
release/3.3.2, #1041 becomes mergeable intomain.