chore: merge upstream thedotmack/claude-mem v12.3.9#16
Merged
Conversation
Sync 30 commits from upstream (v12.3.2 → v12.3.9): - Issue Blowout 2026: 25 bug fixes (thedotmack#2083) - PID reuse detection for container restarts (thedotmack#2082) - Remove bearer auth and platform_source filter (thedotmack#2081) - Security observation types + Telegram notifier (thedotmack#2084) - Per-user port derivation, FTS5 query escaping, RestartGuard All 25 merge conflicts resolved: - 8 version/config files: took upstream versions - 4 build artifacts: took upstream versions - 13 source files: took upstream (our fork changes in separate files) Maintenance tests: 12 pass / 0 fail
Dee-0503
added a commit
that referenced
this pull request
Apr 25, 2026
The upstream merge (PR #16) incorrectly resolved hooks.json conflicts by keeping the fork's old version without per-user port logic. This caused startup hook failures when the worker port derived by hooks.json (37700 + uid%100) didn't match the hardcoded 37777. Take upstream's hooks.json which reads CLAUDE_MEM_WORKER_PORT from settings.json first, then falls back to per-user derivation.
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
1 participant
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.
Summary
Key upstream changes included
Conflict resolution (25 files)
ci:non-green-emailscriptnpm run build)Test plan
bun test tests/maintenance/— 12 pass, 0 fail (our additions preserved)bun test tests/worker/agents/response-processor.test.ts— 26 pass, 1 pre-existing upstream failurenpx claude-mem maintenance statusstill works after merge