Skip to content

chore(deps): bump @contentrain/mcp to 1.5.1#58

Merged
ABB65 merged 1 commit into
mainfrom
chore/mcp-1.5.1
Jun 12, 2026
Merged

chore(deps): bump @contentrain/mcp to 1.5.1#58
ABB65 merged 1 commit into
mainfrom
chore/mcp-1.5.1

Conversation

@ABB65

@ABB65 ABB65 commented Jun 12, 2026

Copy link
Copy Markdown
Member

Summary

Bumps @contentrain/mcp 1.5.0 → 1.5.1.

The remote write path (commitThroughProvider in server/http, used by MCP Cloud) no longer commits a regenerated context.json onto cr/* feature branches. This removes the permanent merge-conflict surface when parallel MCP Cloud writes land (each branch previously mutated context.json from the same base with a fresh timestamp, so the second merge always conflicted and the branch stayed silently pending on auto-merge projects).

Studio's post-merge regeneration on the contentrain branch (regenerateContextOnContentrain) is now the single context.json writer after initProject — consistent with the model documented in CLAUDE.md.

Verified locally: typecheck clean, full suite (unit + integration + nuxt) 659/659, MCP export surface used by Studio (core/context.buildContextChange, tools/annotations) unchanged.

🤖 Generated with Claude Code

Remote write path no longer commits context.json onto cr/* feature
branches, removing the merge-conflict surface for parallel MCP Cloud
writes. Studio-side regeneration on the contentrain branch
(regenerateContextOnContentrain) is now the single writer post-init.
@ABB65 ABB65 merged commit 7e1f173 into main Jun 12, 2026
1 check passed
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.

1 participant