Merge origin/main into local main. Keep both on the three conflicts.

v0-neuron is in this history. origin/main architecture and soul are in too. Sort later.

README.md

@@ -127,3 +127,36 @@ If you are working on a project that's related to OpenCode and is using "opencod
 ---
 
 **Join our community** [Discord](https://discord.gg/opencode) | [X.com](https://x.com/opencode)
+
+---
+
+# ---- keep both, sort later: local main (v0) above, origin/main below ----
+
+# neuron
+
+The canonical CGI substrate: the **soul** (the running agent), the **engram** (its memory
+graph), and the MCP proxy/wrapper that expose it. See `AGENTS.md` for detail, including
+the audit-verified local build/regenerate recipe and known local-build gotchas.
+
+## Quick local build
+
+```bash
+# 1. dist/soul.c must match current .el sources — this refuses otherwise:
+bash tools/build-soul-from-dist.sh dist/neuron
+
+# 2. If it refuses (stale amalgam), regenerate first — see AGENTS.md's
+#    "Build / regenerate dist/soul.c" section for the full, gotcha-laden recipe.
+```
+
+For a full local dev stack (soul + engram + mcp-wrapper + mcp-proxy, wired into Claude
+Code) see `neuron-dev-setup/README.md` instead — this repo alone only builds the soul.
+
+## Code vs. Artifact
+- **Authored source:** `*.el` + `*.elh` at the repo root plus `cli/`, `council/`,
+  `connectd/`, `mcp-proxy/`, `mcp-wrapper/` — edit here.
+- **Artifacts (do not hand-edit):** `dist/soul.c` (generated single-TU amalgam —
+  regenerate via the recipe in `AGENTS.md`, then `tools/soulc-stamp.sh --write`) and
+  the `dist/neuron` binary it compiles to.
+- **Release:** git tag `neuron-vX.Y.Z` on this repo. No `releases/` folders.
+
+See org policy: `docs/CODE-VS-ARTIFACT.md`.