Skip to content

Commit 6793d89

Browse files
authored
Merge branch 'main' into fix/bb-file-bucket-removal-policy
2 parents 57b7ef3 + 6853382 commit 6793d89

97 files changed

Lines changed: 10943 additions & 351 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
---
3+
4+
feat(bench): redesign agent-bench PR-vs-`main` report + fix baseline selection
5+
6+
Internal CI tooling — no published-package changes.
7+
8+
- The report is now two tables built from the same rows: a colors-only
9+
**Overview** (🟢/🟡/🔴 per metric) and a numbers **Detailed results**
10+
(`baseline -> pr`, with a multi-line per-dimension judge cell + stop reason),
11+
preceded by a collapsible glossary and followed by a short executive summary
12+
(paragraph + bullets), a **Potential issues** section, and a collapsed
13+
per-cell analysis. Dropped the old build/verdict/composite columns and the raw
14+
per-dimension blurb.
15+
- New per-metric coloring vs the `main` baseline with a single tunable
16+
`MARGIN_PCT` (±5%), and a new **SCORE = composite ÷ cost** (composite points
17+
per dollar) priced from builder tokens at Bedrock Opus 4.8 rates
18+
(`PRICING`/`cellCost`/`scorePerDollar` in `scoring.mjs`).
19+
- Baseline-selection fix: a PR now always diffs against `latest-main.json` (the
20+
current `main` tip), never the PR's stale recorded `base.sha`; a push to `main`
21+
diffs against the preceding main commit (`github.event.before`) by exact sha.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
---
3+
4+
fix: agent-bench throttling resilience (max-parallel=5 + within-wave startup stagger + throttle-retry with a unit-tested retry classifier) and build the monorepo/dist-registry once per run
5+
6+
Internal CI tooling only — changes are confined to the private, unpublished `@aws-blocks/agent-bench` workspace and the bench GitHub Actions workflow. No published-package (`packages/*`) changes, so this needs no release (empty changeset).
7+
8+
Follow-up review hardening (same PR): the pure retry classifier now lives in `steps/lib/bedrock-retry.mjs` with a table-driven `node --test` suite (`bedrock-retry.test.mjs`); the dist-registry reuse guard requires an actual packed `*.tgz` (not just the dir) so a continue-on-error download that leaves an empty dir falls back to a local build; and the startup stagger keys off the within-wave slot (`index % max-parallel`) so the second wave no longer sleeps 35–63s.

.changeset/dsql-index-sort-order.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/bug-report.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
# Labels are applied by the issue-triage-opened workflow, not this template.
2+
# Adding a labels: field here would race with that workflow on the 'opened' event.
13
name: Bug Report
24
description: Create a report to help us improve AWS Blocks
3-
labels: ["bug", "pending-triage"]
45
body:
56
- type: markdown
67
attributes:

.github/ISSUE_TEMPLATE/feature-request.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
# Labels are applied by the issue-triage-opened workflow, not this template.
2+
# Adding a labels: field here would race with that workflow on the 'opened' event.
13
name: Feature Request
24
description: Suggest an idea to help us improve AWS Blocks
3-
labels: ["feature-request", "pending-triage"]
45
body:
56
- type: markdown
67
attributes:

.github/workflows/agent-bench.yml

Lines changed: 517 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Close stale questions (pending-community-response)
2+
on:
3+
schedule:
4+
- cron: '30 2 * * *'
5+
workflow_dispatch: {}
6+
7+
permissions:
8+
issues: write
9+
10+
jobs:
11+
cleanup:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
15+
with:
16+
only-issue-labels: pending-community-response,question
17+
stale-issue-label: pending-community-response
18+
days-before-issue-stale: -1
19+
days-before-issue-close: 14
20+
close-issue-message: >
21+
This issue has been automatically closed due to a lack of recent activity.
22+
Please feel free to reopen it if you have any further questions or information.
23+
days-before-pr-stale: -1
24+
days-before-pr-close: -1
25+
remove-issue-stale-when-updated: false
26+
operations-per-run: 100
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Issue Triage - Closed
2+
on:
3+
issues:
4+
types: [closed]
5+
6+
concurrency:
7+
group: issue-triage-${{ github.event.issue.number }}
8+
cancel-in-progress: false
9+
10+
permissions:
11+
issues: write
12+
13+
jobs:
14+
cleanup-labels:
15+
if: ${{ contains(github.event.issue.labels.*.name, 'pending-community-response') || contains(github.event.issue.labels.*.name, 'pending-maintainer-response') || contains(github.event.issue.labels.*.name, 'pending-triage') }}
16+
runs-on: ubuntu-latest
17+
env:
18+
ISSUE_NUMBER: ${{ github.event.issue.number }}
19+
REPOSITORY_NAME: ${{ github.repository }}
20+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
21+
steps:
22+
- name: Remove all pending-* labels
23+
run: gh issue edit "$ISSUE_NUMBER" --repo "$REPOSITORY_NAME" --remove-label "pending-community-response" --remove-label "pending-maintainer-response" --remove-label "pending-triage"
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Issue Triage - Comment
2+
on:
3+
issue_comment:
4+
types: [created]
5+
6+
concurrency:
7+
group: issue-triage-${{ github.event.issue.number }}
8+
cancel-in-progress: false
9+
10+
permissions:
11+
issues: write
12+
13+
jobs:
14+
update-response-labels:
15+
runs-on: ubuntu-latest
16+
env:
17+
ISSUE_NUMBER: ${{ github.event.issue.number }}
18+
REPOSITORY_NAME: ${{ github.repository }}
19+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
20+
steps:
21+
- name: Swap to pending-maintainer-response when a community member comments on an open issue
22+
if: ${{ !contains(fromJSON('["MEMBER", "OWNER", "COLLABORATOR"]'), github.event.comment.author_association) && github.event.issue.state == 'open' && !github.event.issue.pull_request }}
23+
run: gh issue edit "$ISSUE_NUMBER" --repo "$REPOSITORY_NAME" --remove-label "pending-community-response" --add-label "pending-maintainer-response"
24+
- name: Move to awaiting-community when a maintainer comments on an open issue
25+
if: ${{ contains(fromJSON('["MEMBER", "OWNER", "COLLABORATOR"]'), github.event.comment.author_association) && github.event.issue.state == 'open' && !github.event.issue.pull_request && !contains(github.event.issue.labels.*.name, 'pending-triage') }}
26+
run: gh issue edit "$ISSUE_NUMBER" --repo "$REPOSITORY_NAME" --remove-label "pending-maintainer-response" --add-label "pending-community-response"
27+
- name: Remove pending-maintainer-response when a maintainer comments on a closed issue
28+
if: ${{ contains(fromJSON('["MEMBER", "OWNER", "COLLABORATOR"]'), github.event.comment.author_association) && github.event.issue.state != 'open' && !github.event.issue.pull_request }}
29+
run: gh issue edit "$ISSUE_NUMBER" --repo "$REPOSITORY_NAME" --remove-label "pending-maintainer-response"
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Issue Triage - Labeled
2+
on:
3+
issues:
4+
types: [labeled]
5+
6+
concurrency:
7+
group: issue-triage-${{ github.event.issue.number }}
8+
cancel-in-progress: false
9+
10+
permissions:
11+
issues: write
12+
13+
jobs:
14+
remove-pending-triage-label:
15+
if: ${{ contains(fromJSON('["question", "bug", "feature-request", "enhancement"]'), github.event.label.name) }}
16+
runs-on: ubuntu-latest
17+
env:
18+
ISSUE_NUMBER: ${{ github.event.issue.number }}
19+
REPOSITORY_NAME: ${{ github.repository }}
20+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
21+
steps:
22+
- name: Remove the pending-triage label
23+
run: gh issue edit "$ISSUE_NUMBER" --repo "$REPOSITORY_NAME" --remove-label "pending-triage"

0 commit comments

Comments
 (0)