diff --git a/AGENTS.md b/AGENTS.md
index 73d452dd5..c81814930 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -134,6 +134,27 @@ bun run test           # Playwright E2E
 
 When adding features, update `CHANGELOG.md` (Unreleased section) and `README.md` (if user-facing). Update `AGENTS.md` when architecture or conventions change.
 
+## Commit messages
+
+Use Conventional Commits for regular development commits: `feat`, `fix`, `refactor`, `perf`, `docs`, `test`, `build`, `ci`, `chore`.
+
+- Keep the first line short, imperative, and scoped when helpful
+- Put rationale and implementation details in the commit body
+- Keep the commit type lowercase (`fix:`, `feat:`, `docs:`), but start each body line/bullet with an uppercase word
+- Prefer scopes that match the project structure: `app`, `tauri`, `core`, `cli`, `mcp`, `vue`, `docs`, or focused domains like `editor`, `scene-graph`, `canvas`, `tools`, `kiwi`, `io`, `text`, `vector`, `color`, `acp`, `ai`, `collab`, `automation`, `i18n`
+- Use the narrowest honest scope, or omit it if the change spans multiple unrelated areas
+
+Example:
+
+```text
+fix(editor): preserve text edit undo state
+
+- Snapshot both text and styleRuns when editing starts
+- Restore both on undo instead of comparing against the live node
+```
+
+Release commits are the exception: keep using `Release v0.x.y`.
+
 ## CLI
 
 - All CLI output must use `agentfmt` formatters — `fmtList`, `fmtHistogram`, `fmtSummary`, `fmtNode`, `fmtTree`, `kv`, `entity`, `bold`, `dim`, etc.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 067af52c2..c09756540 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,16 @@
 
 ### Fixes
 
-- Show actionable ACP install errors in the chat panel when Claude Code, Codex, or Gemini CLI is selected but the required local CLI is missing
-- Fix inline layer rename so clearing the name falls back to the default node name, and Backspace/Delete inside rename inputs no longer delete the layer
-- Fix rotated frame hit testing, hover highlights, and selection overlays so child hover/click areas, frame title labels, and size pills stay aligned during rotation and live rotation preview
+- Show actionable install errors in the chat panel when a required local AI CLI is missing
+- Fix inline layer rename so clearing the name restores the default name, and Backspace/Delete inside rename inputs no longer delete the layer
+- Fix rotated frame hit testing, hover highlights, and selection overlays so interactive areas and overlay labels stay aligned during rotation
+- Fix text edit undo so it restores both the original text and `styleRuns`
+- Pressing Enter with a selected text node now starts text editing and selects all text
+- Fix `ScrubInput` Enter handling so committing a value no longer triggers a second blur-based commit that overwrites it
+- Show the auto-layout panel for `COMPONENT`, `COMPONENT_SET`, and `INSTANCE` nodes
+- Fix missing layout direction icons in the auto-layout controls
+- Fix nested text selection inside gradient cards
+- Unify the size control into a single inline sizing input/dropdown with shorter localized labels to prevent overflow
 
 ## 0.11.2 — 2026-03-30