move release into a single unified GH action

.github/workflows/_release.yml

@@ -1,5 +1,5 @@
 # Reusable release implementation. Not dispatchable on its own — called by
-# release-merged.yml (production repos) and test-release.yml (the shared test
+# release.yml (production repos) and test-release.yml (the shared test
 # repo), which supply `source_sha`, `dist_repo`, and `record`.
 #
 # Always: build and `make publish` to <dist_repo> from the selected source SHA.

.github/workflows/release.yml

@@ -1,7 +1,15 @@
-# Prepare a reviewable release PR. Human merge authorizes release-merged.yml
-# to tag the approved commit and publish the production distribution.
+# Prepare a release PR on manual dispatch; publish its exact merge commit when
+# the PR is merged. Both stages appear under Release Plugin as separate runs.
 # For deploy-only sandbox runs, use test-release.yml.
-name: Prepare plugin release
+name: Release Plugin
+run-name: >-
+  ${{ github.event_name == 'workflow_dispatch'
+      && format('Prepare {0} {1}', inputs.plugin, inputs.version)
+      || github.event.pull_request.merged
+      && github.event.pull_request.head.repo.full_name == github.repository
+      && startsWith(github.event.pull_request.head.ref, 'release/')
+      && format('Publish {0} (PR #{1})', github.event.pull_request.head.ref, github.event.pull_request.number)
+      || format('No release (PR #{0} closed)', github.event.pull_request.number) }}
 
 on:
   workflow_dispatch:
@@ -15,16 +23,20 @@ on:
         required: true
         type: choice
         options: [antigravity, claude, codex, grok]
+  pull_request:
+    types: [closed]
+    branches: [main]
 
 permissions:
   contents: read
 
-concurrency:
-  group: prepare-release-${{ inputs.plugin }}
-  cancel-in-progress: false
-
 jobs:
   prepare:
+    name: Prepare release PR
+    if: github.event_name == 'workflow_dispatch'
+    concurrency:
+      group: prepare-release-${{ inputs.plugin }}
+      cancel-in-progress: false
     runs-on: ubuntu-24.04
     timeout-minutes: 10
     steps:
@@ -80,7 +92,7 @@ jobs:
         run: |
           set -euo pipefail
           if cmp -s <(printf '%s\n' "$VERSION") ".github/release-versions/$PLUGIN"; then
-            echo "::error::Release version is already merged; rerun its post-merge release workflow."
+            echo "::error::Release version is already merged; rerun its publication run in Release Plugin."
             exit 1
           fi
           if git rev-parse -q --verify "refs/tags/$TAG" >/dev/null; then
@@ -142,3 +154,91 @@ jobs:
             exit 1
           fi
           printf 'Release pull request: %s\n' "$PR_URL" >> "$GITHUB_STEP_SUMMARY"
+          printf '\nPreparation is complete. Merging the PR starts a publication run under Release Plugin; closing it without merging does not publish.\n' >> "$GITHUB_STEP_SUMMARY"
+
+  resolve:
+    name: Resolve merged release
+    if: >-
+      github.event_name == 'pull_request' &&
+      github.event.pull_request.merged == true &&
+      github.event.pull_request.head.repo.full_name == github.repository &&
+      startsWith(github.event.pull_request.head.ref, 'release/')
+    runs-on: ubuntu-24.04
+    timeout-minutes: 5
+    permissions:
+      contents: read
+    outputs:
+      plugin: ${{ steps.vars.outputs.plugin }}
+      version: ${{ steps.vars.outputs.version }}
+      source_sha: ${{ steps.vars.outputs.source_sha }}
+      dist_repo: ${{ steps.vars.outputs.dist_repo }}
+    steps:
+      - name: Resolve merged release request
+        id: vars
+        env:
+          PR_MERGED: ${{ github.event.pull_request.merged }}
+          PR_HEAD_REPO: ${{ github.event.pull_request.head.repo.full_name }}
+          SOURCE_REPO: ${{ github.repository }}
+          PR_BASE_REF: ${{ github.event.pull_request.base.ref }}
+          RELEASE_BRANCH: ${{ github.event.pull_request.head.ref }}
+          SOURCE_SHA: ${{ github.event.pull_request.merge_commit_sha }}
+        run: |
+          set -euo pipefail
+          if [ "$PR_MERGED" != "true" ] || [ "$PR_HEAD_REPO" != "$SOURCE_REPO" ] || [ "$PR_BASE_REF" != "main" ]; then
+            echo "::error::Production releases require a merged same-repository PR targeting main."
+            exit 1
+          fi
+          if [[ ! "$RELEASE_BRANCH" =~ ^release/(antigravity|claude|codex|grok)/v([0-9]+\.[0-9]+\.[0-9]+)$ ]]; then
+            echo "::error::Malformed release branch; expected release/<plugin>/vMAJOR.MINOR.PATCH."
+            exit 1
+          fi
+          plugin="${BASH_REMATCH[1]}"
+          version="${BASH_REMATCH[2]}"
+          if [[ ! "$SOURCE_SHA" =~ ^[0-9a-f]{40}$ ]]; then
+            echo "::error::The merged release must have a full lowercase commit SHA."
+            exit 1
+          fi
+          case "$plugin" in
+            antigravity) dist_repo=braintrustdata/braintrust-antigravity-plugin ;;
+            claude) dist_repo=braintrustdata/braintrust-claude-plugin ;;
+            codex) dist_repo=braintrustdata/braintrust-codex-plugin ;;
+            grok) dist_repo=braintrustdata/braintrust-grok-plugin ;;
+          esac
+          {
+            printf 'plugin=%s\n' "$plugin"
+            printf 'version=%s\n' "$version"
+            printf 'source_sha=%s\n' "$SOURCE_SHA"
+            printf 'dist_repo=%s\n' "$dist_repo"
+          } >> "$GITHUB_OUTPUT"
+
+      - name: Checkout approved merge commit
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+        with:
+          ref: ${{ steps.vars.outputs.source_sha }}
+          fetch-depth: 0
+
+      - name: Verify approved release marker
+        id: marker
+        env:
+          PLUGIN: ${{ steps.vars.outputs.plugin }}
+          VERSION: ${{ steps.vars.outputs.version }}
+        run: |
+          set -euo pipefail
+          if ! cmp -s <(printf '%s\n' "$VERSION") ".github/release-versions/$PLUGIN"; then
+            echo "::error::The approved release marker must contain exactly the requested version and a newline."
+            exit 1
+          fi
+
+  release:
+    name: Publish approved release
+    permissions:
+      contents: write
+    needs: resolve
+    uses: ./.github/workflows/_release.yml
+    with:
+      plugin: ${{ needs.resolve.outputs.plugin }}
+      version: ${{ needs.resolve.outputs.version }}
+      source_sha: ${{ needs.resolve.outputs.source_sha }}
+      dist_repo: ${{ needs.resolve.outputs.dist_repo }}
+      record: true
+    secrets: inherit

AGENTS.md

@@ -71,22 +71,25 @@ Cross-repository pushes use `GH_TOKEN` or ambient Git credentials.
 
 ## Releasing
 
-Run **Prepare plugin release** (`release.yml`) on `main` with a plugin and
+Run **Release Plugin** (`release.yml`) on `main` with a plugin and
 version. It opens or updates `release/<plugin>/v<version>` using Braintrust Bot,
 with the manifest changes and a monorepo-only
 `.github/release-versions/<plugin>` approval record. The record gives Antigravity
 a reviewable diff without adding a native manifest version. Preparation never
 tags or deploys.
 
 A human approves and merges the PR under the existing branch protection rules.
-`release-merged.yml` then calls `_release.yml` with that PR's exact merge SHA,
-verifies the reviewed versions, creates `v<version>-<plugin>` and its GitHub
-Release, deploys the distribution, and creates its `v<version>` tag/release.
-It never pushes source changes to `main`. CI runs on release PRs; the current
-rules require one approval but do not require passing CI.
-
-If publishing is interrupted, rerun the post-merge workflow rather than
-preparing the merged version again. An existing source tag must match the
+That merge starts a new run of **Release Plugin** (`release.yml`), which calls
+`_release.yml` with the PR's exact merge SHA, verifies the reviewed versions,
+creates `v<version>-<plugin>` and its GitHub Release, deploys the distribution,
+and creates its `v<version>` tag/release. Preparation and publication are
+separate event-driven runs under one workflow entry, named `Prepare …` and
+`Publish …`; no runner waits for review. Closing a PR without merging skips
+publication. It never pushes source changes to `main`. CI runs on release PRs;
+the current rules require one approval but do not require passing CI.
+
+If publishing is interrupted, rerun the **publication run** in Release Plugin
+rather than manually preparing the merged version again. An existing source tag must match the
 approved merge SHA; an existing distribution tag still rejects publication.
 An unchanged Antigravity artifact may reuse its previous distribution commit
 under the new version tag.

src/plugins/antigravity/content/README.md

@@ -1,45 +1,43 @@
 # Braintrust tracing for Google Antigravity
 
-Capture your Google Antigravity sessions as Braintrust traces, including
-prompts, model responses, and tool activity.
+> **This repository is generated.** It is built from
+> [braintrustdata/braintrust-coding-agent-plugins](https://github.com/braintrustdata/braintrust-coding-agent-plugins).
+> Don't edit files here — make changes and file issues in that repository, and they
+> will be rebuilt into this one.
 
-## Set up tracing
+Trace Google Antigravity coding sessions in Braintrust.
 
-Use the Braintrust CLI to install the plugin and choose where traces are sent:
+## Quickstart
 
-```bash
-bt trace enable antigravity
-```
-
-You can disable it later with:
+Prerequisites:
 
-```bash
-bt trace disable antigravity
-```
+- The latest [Google Antigravity](https://antigravity.google/)
+- The latest [Braintrust CLI (`bt`)](https://www.braintrust.dev/docs/reference/cli/quickstart)
 
-The plugin requires the `bt` CLI and a Unix-compatible `sh`. You can also
-install it directly with:
+Install the plugin and choose where traces are sent:
 
 ```bash
-agy plugin install https://github.com/braintrustdata/braintrust-antigravity-plugin
+bt login --profile myprofile
+bt trace --profile myprofile -p my-coding-agent-project enable antigravity
 ```
 
-However, `bt trace enable antigravity` is recommended because it also saves
-your Braintrust destination.
-
-## Import an existing conversation
-
-Replay a previous Antigravity conversation by its conversation ID:
+This causes Google Antigravity sessions to report to your configured project.
+You can disable the plugin later with:
 
 ```bash
-bt trace import antigravity <conversation-id>
+bt trace disable antigravity
 ```
 
-To continue reporting a conversation while it is active, add `--attach`:
+## What is captured
 
-```bash
-bt trace import antigravity <conversation-id> --attach
-```
+Each traced session includes:
+
+- a root span for the Antigravity session;
+- a turn span for each user request and visible assistant response;
+- LLM spans with available model inputs, outputs, and token usage;
+- tool spans with observable inputs, outputs, duration, outcome, and errors;
+- useful session metadata such as the Antigravity version, model, workspace,
+  and native conversation ID.
 
-Managed `bt trace run antigravity` support and Windows support are not yet
-available.
+The plugin forwards events only to the local Braintrust daemon. It does not
+contain Braintrust credentials or send traces directly to Braintrust.