@contentrain/rules 0.3.0 → 0.3.1

package/context/context-bridge.md

@@ -4,7 +4,7 @@
 
 `context.json` is the project intelligence file. It provides AI agents and Contentrain Studio with structured knowledge about the project: its tech stack, content patterns, conventions, and normalize configuration.
 
-- **Written by:** MCP tools (updated after every write operation)
+- **Written by:** MCP tools (committed together with content changes in the same branch, not as a separate commit)
 - **Read by:** AI agents (at the start of every session) and Studio (for UI configuration)
 - **Location:** `.contentrain/context.json`
 
@@ -206,7 +206,7 @@ When creating `context.json` for the first time, use stack-appropriate defaults.
 
 ## Update Behavior
 
-MCP tools update `context.json` after every write operation:
+MCP tools update `context.json` as part of each write operation, committed together with the content changes in the same branch (not as a separate commit):
 - `contentrain_init` creates the initial file
 - `contentrain_model_save` updates the domains list if a new domain is used
 - `contentrain_content_save` updates content stats

package/essential/contentrain-essentials.md

@@ -7,7 +7,7 @@ This project uses Contentrain for AI-driven content management. These rules are
 MCP is **deterministic infrastructure**. The agent (you) is the **intelligence layer**.
 
 - **Agent decides:** what is content vs code, domain grouping, model structure, replacement expressions (stack-aware), content quality
-- **MCP handles:** file I/O, validation, Git transactions (worktree/branch/commit/merge), project scanning
+- **MCP handles:** file I/O, validation, Git transactions (dedicated contentrain branch/worktree/commit/update-ref), project scanning
 - MCP does NOT make content decisions. It is framework-agnostic.
 
 ## Four Model Kinds
@@ -65,11 +65,16 @@ MCP is **deterministic infrastructure**. The agent (you) is the **intelligence l
 
 ## Git Workflow
 
-- Every write operation creates a worktree + branch automatically
-- **auto-merge** mode: branch merges to main after commit
-- **review** mode: branch pushed to remote for team review
-- Branch naming: `contentrain/{operation}/{model}/{locale}/{timestamp}`
-- Never create branches manually, never commit directly to main
+- A dedicated `contentrain` branch is the single source of truth for content state, created at init
+- Every write operation creates a temporary worktree on the `contentrain` branch automatically
+- Feature branches (`contentrain/{operation}/{model}/{locale}/{timestamp}`) are created from `contentrain` for each operation
+- **auto-merge** mode: feature branch merges into `contentrain`, then `contentrain` advances baseBranch via update-ref (fast-forward), then `.contentrain/` files are selectively synced to the developer's working tree
+- **review** mode: feature branch pushed to remote for team review
+- Developer's working tree is never mutated during MCP git operations (no stash, no checkout, no merge on the developer's tree)
+- If the developer manually edits `.contentrain/` files, MCP sync skips dirty files and warns
+- The `contentrain` branch is protected from deletion
+- context.json is committed together with content changes, not as a separate commit
+- Never create branches manually, never commit directly to main or the `contentrain` branch
 - 50+ active branches = warning, 80+ = blocked
 
 ## Localization

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentrain/rules",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "license": "MIT",
   "description": "AI agent rules for Contentrain — quality standards, architecture conventions, IDE integration",
   "type": "module",

package/prompts/generate-mode.md

@@ -173,7 +173,7 @@ Call `contentrain_validate` after all content is created.
 
 Call `contentrain_submit` to finalize.
 
-- In `auto-merge` mode: branch is merged to main, content is published.
+- In `auto-merge` mode: feature branch is merged into `contentrain`, baseBranch is advanced via update-ref, `.contentrain/` files are selectively synced to the developer's working tree, content is published.
 - In `review` mode: branch is pushed to remote for team review.
 - Normalize operations always use review mode regardless of config.