diff --git a/AGENTS.md b/AGENTS.md
index 08062c1e..9e5382c9 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -237,8 +237,8 @@ Before branch movement or edits:
 Our sole remote and CI/CD platform is **core-gitquarters.acbcontent.org**.
 - **DO NOT** use the `gh` (GitHub) CLI for normal work or PR management.
 - **DO NOT** attempt to push, pull, or clone from `github.com` for developer/agent loops.
-- **USE** the provided Forgejo MCP tools if available.
-- **USE** the `tea` CLI (Gitea/Forgejo CLI) for issues, PRs, and repository management targeting `core-gitquarters.acbcontent.org`.
+- **DO NOT** use the `tea` CLI (Gitea/Forgejo CLI) — it frequently hangs and times out (Cloudflare 524) due to HTTP/2 proxying and WAF handoffs.
+- **USE** the Gitea/Forgejo MCP tools for issues, PRs, and repository management targeting `core-gitquarters.acbcontent.org`.
 
 ### Local-First CI Validation Protocol
 To optimize server resources and bypass external CI billing dependencies, all agents and developers must run validation suites locally.
@@ -246,9 +246,9 @@ To optimize server resources and bypass external CI billing dependencies, all ag
   ```bash
   uv run core test --suite smoke -q
   ```
-  Ensure all 108+ tests pass. Pushing broken code is a critical protocol violation.
+  Ensure all 175 tests pass (parity with the CI smoke gate is pinned by `test_cli_smoke_suite_covers_ci_smoke_gate`). Pushing broken code is a critical protocol violation.
 - **Pre-Merge Gate:** Before proposing a merge or requesting a review on a PR, you **MUST** run the larger validation suite relevant to your changes (e.g. `uv run core test --suite cognition` or `uv run core test --suite algebra`).
-- **PR Documentation:** When creating a PR on Forgejo (via `tea pr create`), document the local test execution in the PR description, matching this format:
+- **PR Documentation:** When creating a PR on Forgejo (via the Forgejo MCP tools), document the local test execution in the PR description, matching this format:
   `[Verification]: Smoke suite passed locally (<run_duration>s, <test_count> passed)`
 
 ### CI/CD Runner Architecture (2026-07-16 doctrine)
diff --git a/CLAUDE.md b/CLAUDE.md
index fea43d6c..fd5947fd 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -3,7 +3,7 @@
 `AGENTS.md` is the canonical governance file. If this file conflicts, follow `AGENTS.md`.
 
 Startup: read `AGENTS.md`, `docs/specs/runtime_contracts.md`, inspect working tree, use the smallest validation lane.
-**CRITICAL**: Remote is `core-gitquarters.acbcontent.org`. Do not use GitHub/`gh` CLI. Use Forgejo tools/`gitea` CLI.
+**CRITICAL**: Remote is `core-gitquarters.acbcontent.org`. Do not use GitHub/`gh` CLI. Do not use `tea` CLI. Use Gitea/Forgejo MCP tools.
 **CI**: local-first — pre-push gates are mandatory; CI jobs run on the developer's local Mac Act runner, never on the Forgejo server (see `AGENTS.md` §CI/CD Runner Architecture).
 
 Before non-trivial edits, apply the protocol in `AGENTS.md`.