chore(merge-train/spartan): merge next to resolve conflicts on #22980

.github/workflows/ci3.yml

@@ -196,10 +196,11 @@ jobs:
       matrix:
         test_set: ["1", "2"]
     # We run on current nightly tags only, or when the ci-network-scenario label is present in a PR.
-    needs: [ci, validate-nightly-tag]
+    needs: [ci, validate-nightly-tag, ci-release-publish]
     if: |
       always()
       && (needs.ci.result == 'success' || needs.ci.result == 'skipped')
+      && (needs.ci-release-publish.result == 'success' || needs.ci-release-publish.result == 'skipped')
       && github.event.pull_request.head.repo.fork != true
       && github.event.pull_request.draft == false
       && (

.test_patterns.yml

@@ -60,9 +60,6 @@ tests:
     error_regex: "Aborted.*core dumped"
     owners:
       - *adam
-  - regex: "barretenberg/cpp/scripts/run_bench.sh wasm bb-micro-bench/wasm/chonk build-wasm-threads/bin/chonk_bench"
-    owners:
-      - *luke
 
   # noir
   # Something to do with how I run the tests now. Think these are fine in nextest.
@@ -297,11 +294,6 @@ tests:
     owners:
       - *palla
 
-  - regex: "bb-micro-bench/wasm/chonk build-wasm-threads/bin/chonk_bench"
-    error_regex: "core dumped"
-    owners:
-      - *adam
-
   # tx_stats_bench's 10 TPS sub-test occasionally returns valid:false from a single IVC
   # verification under heavy concurrency (8 parallel verifiers, each spawning a fresh bb subprocess
   # via the bb.js NativeUnixSocket backend introduced in #21564). The serial sub-tests pass.
@@ -377,3 +369,8 @@ tests:
     error_regex: "timeout: sending signal"
     owners:
       - *charlie
+
+  - regex: "run_test.sh simple tx_stats_bench"
+    error_regex: "✕ verifies transactions at 10 TPS"
+    owners:
+      - *phil

CLAUDE.md

@@ -107,6 +107,16 @@ Do not explain *what* the code does — well-named identifiers cover that. Comme
 Do not reference the current task, PR, caller, or author (`// used by X`, `// fix for issue #123`, `// AI-generated`), and do not add banner-style section comments (`// ===== HELPERS =====`). Both rot the moment the surrounding code is moved.
 </writing_comments>
 
+<jargon>
+Avoid recurring AI-isms in chat replies, PR descriptions, commit messages, code comments, and docs. Substitutes:
+
+- **"load bearing"** → *important*, *critical*, *required*, or describe the actual dependency (e.g. "the scheduler relies on this invariant").
+- **"seam"** (for an interaction point or boundary) → *interface*, *boundary*, *call site*, *integration point*.
+- **"north star"** → *goal*, *main goal*, *objective*.
+- **"sharpening"** (for adding detail or refining wording) → *clarifying*, *adding detail*, *tightening*, *refining*.
+- **"You're absolutely right"** and effusive agreement openers (*"Great catch!"*, *"Excellent point!"*) → never lead a reply with these. A short acknowledgement (*"Right — …"*, *"Agreed."*) is fine, and a closing *"you're right"* at the end of a long reply is acceptable when warranted. Lead with substance, not validation.
+</jargon>
+
 <attribution>
 Attribute work to the git author, not to Claude. Do not add `Co-Authored-By: Claude` trailers or `Generated with Claude Code` in PR descriptions. The git author (from `git config user.name`) is the author of record.
 </attribution>

Makefile

@@ -301,7 +301,6 @@ aztec-nr: noir bb-cpp-native
 noir-projects-txe-tests:
 	$(call test,$@,noir-projects/aztec-nr)
 	$(call test,$@,noir-projects/noir-contracts)
-	$(call test,$@,noir-projects/noir-contracts-comp-failures)
 
 # Noir Projects - Aggregate target (builds all sub-projects)
 noir-projects: noir-protocol-circuits mock-protocol-circuits noir-contracts aztec-nr