diff --git a/AGENTS.md b/AGENTS.md
index 6dc5306..2f6352d 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -16,6 +16,7 @@ See `README.md` for setup. Run the repo's lint / typecheck / test before opening
 ## Security
 
 Report vulnerabilities via the [Security Policy](https://github.com/wave-av/.github/blob/main/SECURITY.md) (security@wave.online) — never in a public issue.
+<<<<<<< Updated upstream
 
 # Platform Context
 
@@ -57,3 +58,18 @@ index:
   - family: permissions-contract
     path: PERMISSIONS.md
 ```
+||||||| Stash base
+=======
+
+# Platform Context
+
+You are working inside the WAVE platform (wave-av org, 157 repos). Before acting:
+
+1. **The registry is the SSOT.** Query it via `@wave-av/registry-sdk` or the REST API at `https://goqtrxgdmaqojmixradj.supabase.co/rest/v1/<table>`. Tables: models, tools, vendors, products (25+ with data planes), deliverables, tests, prose, usage_logs.
+2. **Five physics laws gate everything** in CI: gauge-invariance (no raw slug), frame-independence (scores inherited), conservation-of-declaration (four renderings), entropy-monotonicity (nothing unregistered), token-budget-conservation.
+3. **The full fleet map** lives at `governance/plans/session-deliverable-registry/PLATFORM-MAP.md` in claude-workstation (157 repos by kind: core/spoke/ssot/tool/sdk).
+4. **The 24-axis model taxonomy** lives at `wave-foundation/frameworks/model-routing/champions.json` (calibrated_at 2026-08-24).
+5. **The inference pool** runs on our rigs at `http://100.92.89.55:8800/v1` (internal, $0). Frontier fallback via openrouter/anthropic. The rail field on models tracks internal vs customer.
+6. **The voice laws**: no em-dashes, every word earns its place, short words over long, active voice, receipt over adjective. Enforced by voice-gate.mjs.
+7. **The test-matrix**: every shipped artifact carries unit/integration/smoke/e2e/probe receipts in the tests table. No test, no ship.
+>>>>>>> Stashed changes
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69a9b7d..1fb8061 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ All notable changes to this project are documented here. The format is based on
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+<<<<<<< HEAD
 
 ### Fixed
 
@@ -31,3 +32,24 @@ All notable changes to this project are documented here. The format is based on
   Contributors on forks are affected: a maintainer's `/review` on a fork PR is
   now declined with a warning rather than silently running.
   (wave-av/wave-foundation-public#73)
+||||||| parent of 4ae7471 (docs(changelog): add agent-clip-demo entry)
+=======
+
+### Added
+
+- **agent-clip-demo** — end-to-end agent-video demo: voice synthesis → clip
+  creation → signed video delivery, verified against the live production API.
+
+  Three commands (`demo.mjs synthesize | clip | all`) reproduce the keystone
+  pipeline: `POST /v1/voice {text}` returns real `audio/mpeg` MP3 narration;
+  `POST /v1/clips {source, in, out}` returns a `201` clipId + HMAC-signed
+  delivery URL; the delivery URL serves `200 video/mp4` from
+  `media.wave.online`. Includes a WAVE-branded showcase page (`index.html`)
+  and a pre-rendered sample video (WAVE narration over a Big Buck Bunny
+  source clip).
+
+  Verification receipts: source recording `f7acfa81-…` (BBB, .mp4, ready)
+  → clip create `201` → clip engine produced 46KB 5s 1280×720 H.264/AAC
+  → signed URL `200 video/mp4`. All against `api.wave.online` and
+  `media.wave.online`.
+>>>>>>> 4ae7471 (docs(changelog): add agent-clip-demo entry)