chore: merge next into merge-train/barretenberg (raw, conflict markers)

Author: AztecBot

.claude/skills/merge-train-infra/SKILL.md

@@ -21,7 +21,7 @@ The merge-train system is fully automated via GitHub Actions in `.github/workflo
 
 5. **Recreation & Wakeup** (`merge-train-recreate.yml`): Triggered when a PR is closed (merged). If the merged PR's head branch starts with `merge-train/`, recreates the branch from the base branch (usually `next`). Then runs `scripts/merge-train/wakeup-prs.sh` to add the `ci-wakeup-pr-after-merge` label to all open PRs targeting the branch that have passed CI and have automerge enabled. This triggers a CI re-run (typically a no-op via tree-hash cache) so those PRs can proceed through the merge queue. The label is immediately removed by a step in `ci3.yml` so it can be re-applied on subsequent merges.
 
-6. **Failure Notification** (`merge-queue-dequeue-notify.yml`): Triggered when a PR is dequeued from the merge queue. If the PR's head branch starts with `merge-train/` and the PR was NOT merged, sends a Slack notification via `ci3/merge_train_failure_slack_notify`.
+6. **Failure Notification** (`merge-queue-dequeue-notify.yml`): Triggered when a PR is dequeued from the merge queue. If the PR's head branch starts with `merge-train/` and the PR was NOT merged, sends a Slack notification via `ci3/merge_train_failure_slack_notify`. That script also kicks off a ClaudeBox session to investigate/fix the dequeued PR (`ci3/slack_notify_with_claudebox_kickoff`), passing `--repo "$GITHUB_REPOSITORY"` so the session runs in the mode matching the repo the train lives on. When the train is on a private mirror (`…-private`), `claudebox.yml` selects private mode; otherwise it stays public. Without that repo hint a private-train fix session lands in public mode and cannot read the PR or open the fix.
 
 ## CI Integration Details
 

.github/workflows/ci3.yml

@@ -16,8 +16,11 @@ on:
   merge_group: {}
 
 concurrency:
-  # Allow full concurrency for merge-train PRs, one-run-per-branch for everything else.
-  group: ci3-${{ (startsWith(github.event.pull_request.head.ref, 'merge-train/') && github.run_id) || github.event.merge_group.head_ref || github.ref_name }}
+  # merge-train PRs: one run per commit — distinct commits run concurrently (each is a real
+  # train state to test), but duplicate events for the same commit (synchronize + the bot's
+  # label re-applies) collapse. Keying on head.sha instead of run_id is what collapses them;
+  # run_id is unique per run and never collapsed anything. Everything else: one run per branch.
+  group: ci3-${{ (startsWith(github.event.pull_request.head.ref, 'merge-train/') && github.event.pull_request.head.sha) || github.event.merge_group.head_ref || github.ref_name }}
   cancel-in-progress: true
 
 jobs:

.github/workflows/claudebox.yml

@@ -19,6 +19,14 @@ on:
         description: 'Git ref the session should work against (e.g., origin/merge-train/barretenberg)'
         required: false
         type: string
+      repo:
+        description: 'Repo the work targets (owner/repo). Defaults to this repo. A private target (…-private) makes the session run in private mode.'
+        required: false
+        type: string
+      mode:
+        description: 'ClaudeBox repo-access mode (public|private). Leave empty to infer from the target repo.'
+        required: false
+        type: string
       slack_channel:
         description: 'Slack channel ID to thread status into (set by the kickoff script)'
         required: false
@@ -124,15 +132,19 @@ jobs:
           CLAUDEBOX_LINK: ${{ steps.parse.outputs.link }}
           COMMENT_ID: ${{ github.event.comment.id || '' }}
           RUN_COMMENT_ID: ${{ steps.status_comment.outputs.run_comment_id || '' }}
-          REPO: ${{ github.repository }}
+          REPO: ${{ inputs.repo || github.repository }}
           RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
           AUTHOR: ${{ github.event.comment.user.login || github.actor }}
           SLACK_CHANNEL: ${{ inputs.slack_channel || '' }}
           SLACK_THREAD_TS: ${{ inputs.slack_thread_ts || '' }}
-          # Public mode grants the session read-write access to public repos
-          # (aztec-packages). Without it the session only gets the group's
-          # unscoped repos and cannot open PRs against aztec-packages.
-          CLAUDEBOX_MODE: ${{ vars.CLAUDEBOX_MODE || 'public' }}
+          # Mode selection, in priority order:
+          #   1. an explicit `mode` input (caller knows best);
+          #   2. private, when the target repo is a private mirror (…-private) —
+          #      e.g. a merge-train dequeue on aztec-packages-private, which a
+          #      public-mode session cannot read or open a fix PR against;
+          #   3. the repo/org default (public) for ordinary /claudebox work on
+          #      aztec-packages.
+          CLAUDEBOX_MODE: ${{ inputs.mode || (endsWith(inputs.repo || github.repository, '-private') && 'private' || vars.CLAUDEBOX_MODE || 'public') }}
         run: |
           if [ -z "${CLAUDEBOX_API_SECRET:-}" ]; then
             echo "ERROR: CLAUDEBOX_API_SECRET is not set; cannot dispatch ClaudeBox v2"

.github/workflows/merge-train-create-pr.yml

@@ -24,11 +24,11 @@ jobs:
             branch="${{ github.ref_name }}"
 
             # Determine base branch. Most trains target next; trains suffixed
-            # with -v5 (e.g. spartan-v5, fairies-v5) target the v5 release line
-            # (v5-next) instead.
+            # with -v<N> (e.g. spartan-v5, fairies-v5, spartan-v6) target the
+            # matching release line (v5-next, v6-next) instead.
             base_branch="next"
-            if [[ "$branch" == *-v5 ]]; then
-              base_branch="v5-next"
+            if [[ "$branch" =~ -v([0-9]+)$ ]]; then
+              base_branch="v${BASH_REMATCH[1]}-next"
             fi
 
             # Skip if this is a merge commit (multiple parents) -- unless its
@@ -55,7 +55,7 @@ jobs:
 
               # Create PR with ci-no-squash label
               labels="ci-no-squash"
-              if [[ "$branch" == "merge-train/spartan" || "$branch" == "merge-train/spartan-v5" || "$branch" == "merge-train/ci" ]]; then
+              if [[ "$branch" == "merge-train/spartan" || "$branch" == "merge-train/spartan-v5" || "$branch" == "merge-train/spartan-v6" || "$branch" == "merge-train/ci" ]]; then
                 labels="$labels,ci-full-no-test-cache"
               fi
               # Trains targeting the v5 release line are ports into v5-next.

.github/workflows/merge-train-next-to-branches.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - next
       - v5-next
+      - v6-next
 
 jobs:
   merge-to-trains:
@@ -27,13 +28,17 @@ jobs:
           GH_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
           COMMIT_SHA: ${{ github.sha }}
         run: |
-          # The -v5 trains track the v5 release line (v5-next); every other
-          # train tracks next. Sync only the trains fed by the branch that was
-          # just pushed.
+          # The -v<N> trains track the matching release line (v5-next, v6-next);
+          # every other train tracks next. Sync only the trains fed by the
+          # branch that was just pushed.
           if [[ "${{ github.ref_name }}" == "v5-next" ]]; then
             for branch in merge-train/spartan-v5 merge-train/fairies-v5; do
               ./scripts/merge-train/merge-next.sh "$branch" v5-next || true
             done
+          elif [[ "${{ github.ref_name }}" == "v6-next" ]]; then
+            for branch in merge-train/spartan-v6; do
+              ./scripts/merge-train/merge-next.sh "$branch" v6-next || true
+            done
           else
             for branch in merge-train/avm merge-train/barretenberg merge-train/ci merge-train/docs merge-train/fairies merge-train/spartan; do
               ./scripts/merge-train/merge-next.sh "$branch" || true

.github/workflows/merge-train-stale-check.yml

@@ -38,6 +38,22 @@ jobs:
           BASE_BRANCH: v5-next
         run: ./ci3/merge_train_stale_check merge-train/spartan-v5 '#team-alpha'
 
+  spartan-v6:
+    name: Check merge-train/spartan-v6
+    if: ${{ github.event_name != 'schedule' || github.repository == 'AztecProtocol/aztec-packages' }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: read
+    steps:
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+      - name: Run stale check
+        env:
+          GH_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+          BASE_BRANCH: v6-next
+        run: ./ci3/merge_train_stale_check merge-train/spartan-v6 '#team-alpha'
+
   fairies-v5:
     name: Check merge-train/fairies-v5
     runs-on: ubuntu-latest

.github/workflows/metrics-deploy.yml

@@ -41,7 +41,7 @@ on:
         description: Optional Terraform list of Slack user IDs to mention on Grafana alert notifications
         required: false
         type: string
-        default: '["U0AHB6VR8N5"]'
+        default: '["U0AQPRA1FSL"]'
     secrets:
       GCP_SA_KEY:
         required: true
@@ -78,7 +78,7 @@ on:
       slack_alert_mention_user_ids:
         description: Optional Terraform list of Slack user IDs to mention on Grafana alert notifications
         required: false
-        default: '["U0AHB6VR8N5"]'
+        default: '["U0AQPRA1FSL"]'
 
 jobs:
   metrics_deployment:

barretenberg/cpp/src/barretenberg/common/map.hpp

@@ -21,8 +21,6 @@ Cont<OutElem> map(Cont<InElem, Args...> const& in, F&& op)
 
 /*
  * Generic map function for mapping a std::array's elements to another type.
- * TODO: this has only been added because I (Mike) couldn't get the above to work
- * with an array.
  */
 template <std::size_t SIZE,
           typename InElem,
@@ -34,5 +32,8 @@ std::array<OutElem, SIZE> map(std::array<InElem, SIZE> const& in, F&& op)
     std::transform(in.begin(), in.end(), result.begin(), op);
     return result;
 }
+<<<<<<< HEAD
 
+=======
+>>>>>>> origin/next
 } // namespace bb::transform

barretenberg/cpp/src/barretenberg/common/printf.hpp

@@ -57,9 +57,6 @@ class MegaAvmFlavor : public MegaAVMFlavor_Generated {
     static constexpr size_t BATCHED_RELATION_PARTIAL_LENGTH = MAX_PARTIAL_RELATION_LENGTH + 1;
     static constexpr size_t NUM_RELATIONS = std::tuple_size_v<Relations>;
 
-    static constexpr size_t num_frs_comm = FrCodec::calc_num_fields<Commitment>();
-    static constexpr size_t num_frs_fr = FrCodec::calc_num_fields<FF>();
-
     static constexpr size_t NUM_SUBRELATIONS = compute_number_of_subrelations<Relations>();
     using SubrelationSeparator = FF;