Skip to content

fix(dev): align statistics package branches with Mergify - #782

Merged
mergify[bot] merged 2 commits into
mainfrom
codex/mrp-regex-scripts
Oct 9, 2026
Merged

mergify[bot] merged 2 commits into
mainfrom
codex/mrp-regex-scripts

Conversation

@Cuarroc

@Cuarroc Cuarroc commented Oct 9, 2026 •

Copy link
Copy Markdown
Owner

Die beiden Statistikskripte erkennen jetzt dieselben Paketbranches wie die Berichtspflicht aus PR #768.
Branches von Cursor sowie Denkraum- und Z-Pakete werden mitgezählt, Dokumentations- und Queue-Branches bleiben ausgeschlossen.
Die Tests und die vollständige lokale Prüfung sind grün; der Entwurf wartet auf die unabhängige Review.

Report

  • Task: MRP-REGEX-SCRIPTS / R768-A2, UMSETZEN, Tier B; bounded worker delivery for Root's queue refill.
  • Base: a1d9a5fba38d2e50fe72727a644cb587edbe9357, verified descendant of dd7391cd064a0720b2d1f747e959bbeab5a3fe7d.
  • Head: e1abdb63aa5aaf39bb2f43cb4fbc6080de0d7408; branch: codex/mrp-regex-scripts.
  • Source: .mergify.yml from origin/codex/mergify-report-regex at 10788225cab64b6d1bbe8e5fd3645a7c870089d8 (fix(ci): extend report protection to current package branches #768).
  • Both patterns use providers claude|codex|kimi|opencode|glm|cursor and prefixes w\d+-|df\d+|ki-\d+|hq2-|dr-|z\d+-, case-insensitively. Weekly package IDs retain numeric task suffixes (e.g. w3-02, dr-14); prefix-only IDs such as z2- are counted too. Report formatting and metric formulas are unchanged.
  • Regression tests cover every provider/prefix combination, uppercase branches, excluded documentation/infra/queue/unknown-provider branches, malformed prefixes, and weekly count denominators. The old ci-03 assertion now expects exclusion, matching the requested Mergify contract.
  • Scope: four owned files, 42 additions + 4 deletions = 46 lines; no Mergify, docs, dependency manifest or lockfile changes.

Evidence (2026-10-09)

  • Before fix: node --test scripts/lib/dev-mrp-count.test.mjs scripts/lib/dev-bench-weekly.test.mjs — exit 1, 16 passed / 3 failed; recorded in test-first commit e1281401e3d3be18c33e12168bcabbe6d765cf62 before the implementation commit.
  • After fix: same command — exit 0, 19 passed / 0 failed.
  • bash scripts/ci/red-first.sh — exit 0; both exact named tests missing at merge-base and green at head. The gate provisioned locked dependencies in its temporary base checkout automatically.
  • bash scripts/ci/gates.sh lane prepush in the assigned worktree at the reported head — exit 0, 22 gates, 279 seconds; Rust suite 1,892 passed / 7 skipped.
  • bash scripts/ci/secret-scan.sh before each commit — exit 0; commit hooks also passed.
  • git push -u origin codex/mrp-regex-scripts — exit 0; its full prepush hook passed again (122 seconds).
  • git ls-remote origin codex/mrp-regex-scripts — exit 0; remote SHA equals the reported head.
  • git diff --check origin/main...HEAD — exit 0; working tree clean after checks.
  • Additional read-only node --input-type=module comparison against the pinned Mergify regex — exit 0; both scripts agreed on 288 provider/suffix/case combinations, including bare prefixes.

NICHT ABGEDECKT

  • Linux does not compile or run #[cfg(windows)] tests or Windows clippy branches. The Windows lane runs in the merge queue; the seven skipped Rust tests are not claimed as covered.
  • Browser smoke, frontend production build and linux-only workflow gates are outside local prepush. External service availability is not checked.
  • Provider quota/model observation and the lage-jetzt memory mirror were unavailable; no claims are made about them. Start checks passed before gates, following one required build-slot wait.

Review and handover

Review: ausstehend (Stufe B) — pending Root dispatch. No worker review or review findings are claimed.
Implementation, red-first, local checks and verified push are complete. Root owns independent review, acceptance, ready status and Mergify integration; this PR remains a draft. The bounded native worker goal ends at this checked handover; the parent goal remains open.

Root-Abnahme (09.10.2026, head e1abdb6)

ID Source Severity Finding Disposition
R782-A1 Anthropic info bench-weekly.mjs:15 prefix-only branches (z2-) collapse into one weekly ID Accepted (documented in PR)
R782-A2 Anthropic info ci-03 no longer counted as package Accepted (docs/infra branches are not packages per .mergify.yml)

Tier B: author Codex gpt-6-astra (OpenAI); reviewer Anthropic family (claude-sonnet-5-5 on the server), verdict approve, bound to head e1abdb6. Report: ~/pa-orch/reports/review-pr782-anthropic-r1-e1abdb63aa5a.md.

NICHT ABGEDECKT addendum: Windows lane comes from the merge queue.

Test-First: scripts/lib/dev-mrp-count.test.mjs::countRp recognizes all current Mergify package branches
Test-First: scripts/lib/dev-bench-weekly.test.mjs::weekly package counts follow current Mergify prefixes and preserve package IDs
Test-First: scripts/lib/dev-mrp-count.test.mjs::countRp recognizes all current Mergify package branches
Test-First: scripts/lib/dev-bench-weekly.test.mjs::weekly package counts follow current Mergify prefixes and preserve package IDs
@Cuarroc
Cuarroc marked this pull request as ready for review October 9, 2026 00:52
@Cuarroc Cuarroc added the review-ok Pipeline: review disposition complete, no open high finding label Oct 9, 2026

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: e1abdb63aa

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

// provider/<letters+digits>-<number>...: w3-02d-x -> w3-02, ki-30-x -> ki-30, ci-03-x -> ci-03
packageBranch: /^(?:claude|codex|kimi|opencode|glm)\/([a-z]+\d*-\d+)/i,
// Mergify package prefixes; retain task numbers: w3-02d-x -> w3-02, dr-14-sort -> dr-14.
packageBranch: /^(?:claude|codex|kimi|opencode|glm|cursor)\/((?:w\d+-|df\d+|ki-\d+|hq2-|dr-|z\d+-)\d*)/i,

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Verwende eindeutige IDs für DR- und Z-Pakete

Wenn mehrere Z2- oder unterteilte DR-Pakete im selben Messfenster liegen, gibt packageId für alle Z2-Branches nur z2- und beispielsweise für dr-07e1 sowie dr-07e2 jeweils nur dr-07 zurück. Dadurch meldet thr_pkgs zu wenige unterschiedliche Pakete und rework_fix kann einen Fix eines anderen Pakets fälschlich als Nacharbeit innerhalb von 72 Stunden zählen; docs/PLAN.md führt diese Suffixe ausdrücklich als getrennte Pakete. Die Extraktion muss daher den unterscheidenden Paketteil bewahren, statt am gemeinsamen Präfix abzuschneiden.

AGENTS.md reference: AGENTS.md:L13-L15

Useful? React with 👍 / 👎.

// provider/<letters+digits>-<number>...: w3-02d-x -> w3-02, ki-30-x -> ki-30, ci-03-x -> ci-03
packageBranch: /^(?:claude|codex|kimi|opencode|glm)\/([a-z]+\d*-\d+)/i,
// Mergify package prefixes; retain task numbers: w3-02d-x -> w3-02, dr-14-sort -> dr-14.
packageBranch: /^(?:claude|codex|kimi|opencode|glm|cursor)\/((?:w\d+-|df\d+|ki-\d+|hq2-|dr-|z\d+-)\d*)/i,

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Versioniere die geänderte Benchmark-Definition

Sobald diese Version für die nächste Wochenmessung verwendet wird, werden Cursor-, DR-, Z- und zuvor ausgeschlossene w16-*-Branches neu als Pakete gezählt, während etwa ci-* und fu-* aus der Reihe fallen; im vorhandenen Merge-Verlauf ändert sich damit die Klassifikation für 144 von 399 Branches. Die Ergebnisse werden trotzdem direkt mit der unveränderten J2-Baseline und den Zielen verglichen, obwohl docs/plan/v1.6.0/benchmark.md:95-103 ausdrücklich festlegt, dass Definition und Baseline nicht geändert werden dürfen. Das kann M-THR und M-REWORK allein durch den Regexwechsel bestehen oder scheitern lassen; entweder muss der eingefrorene Klassifikator für diese Reihe erhalten bleiben oder eine neue, neu berechnete Baseline samt eigener Metrikversion eingeführt werden.

Useful? React with 👍 / 👎.

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-09T00:55:44.618693Z e1abdb6 Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@mergify mergify Bot added the queued label Oct 9, 2026
@mergify
mergify Bot merged commit 0c811a6 into main Oct 9, 2026
17 checks passed
@mergify

mergify Bot commented Oct 9, 2026

Copy link
Copy Markdown
Contributor

Merge Queue Status

This pull request spent 27 minutes 2 seconds in the queue, including 14 minutes 58 seconds running CI.

Required conditions to merge
  • check-success = gates (linux)
  • check-success = gates (windows)
  • check-success = red-first
  • github-review-approved [🛡 GitHub repository ruleset rule main-pr-required-checks]
  • label != do-not-merge
  • any of [🛡 GitHub repository ruleset rule main-pr-required-checks]:
    • check-success = @github-actions/gates (linux)
    • check-neutral = @github-actions/gates (linux)
    • check-skipped = @github-actions/gates (linux)
  • any of [🛡 GitHub repository ruleset rule main-pr-required-checks]:
    • check-success = @github-actions/gates (windows)
    • check-neutral = @github-actions/gates (windows)
    • check-skipped = @github-actions/gates (windows)
  • any of [🛡 GitHub repository ruleset rule main-pr-required-checks]:
    • check-success = @github-actions/red-first
    • check-neutral = @github-actions/red-first
    • check-skipped = @github-actions/red-first
  • any of [🛡 GitHub repository ruleset rule main-pr-required-checks]:
    • check-neutral = @mergify/Mergify Merge Protections
    • check-skipped = @mergify/Mergify Merge Protections
    • check-success = @mergify/Mergify Merge Protections

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

review-ok Pipeline: review disposition complete, no open high finding

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant