@orderful/droid 0.43.0 → 0.44.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @orderful/droid
 
+## 0.44.0
+
+### Minor Changes
+
+- [#259](https://github.com/Orderful/droid/pull/259) [`f64bab2`](https://github.com/Orderful/droid/commit/f64bab250e25bb57ad9c1c2ac50246455a18eb42) Thanks [@frytyler](https://github.com/frytyler)! - Add /release merge command to merge release PRs when all checks pass and notify Slack. Fix release notes generation to compare branches instead of listing all historically merged PRs.
+
 ## 0.43.0
 
 ### Minor Changes

package/dist/tools/release/skills/release/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: release
-description: "Release ceremony automation for dev-to-master releases. Use when starting a release, checking release status, or completing a release. User prompts like 'start a release', 'release status', 'release complete'."
-argument-hint: "[start [repo] | status | complete [repo]]"
+description: "Release ceremony automation for dev-to-master releases. Use when starting a release, merging a release, checking release status, or completing a release. User prompts like 'start a release', 'merge the release', 'release status', 'release complete'."
+argument-hint: "[start [repo] | merge [repo] | status | complete [repo]]"
 allowed-tools: [Read, Write, Glob, Grep, Bash, Edit]
 ---
 
@@ -48,6 +48,7 @@ If no repos have `release_branch` set, tell user:
 | Command | Action |
 |---------|--------|
 | `/release start [repo]` | Create release PR + notify Slack |
+| `/release merge [repo]` | Merge release PR (only if checks pass) + notify Slack |
 | `/release status` | Check open release PRs + CI state |
 | `/release complete [repo]` | Post completion to Slack |
 

package/dist/tools/release/skills/release/references/templates.md

@@ -24,6 +24,19 @@ Risk emojis:
 - Low Risk: `:large_green_circle:`
 - High Risk: `:warning:`
 
+### Release Merged
+
+```
+:merged-pr: *Release merged — {repo_name}*
+
+*PR:* <{pr_url}|#{pr_number}>
+*Branch:* `{release_branch}` → `{production_branch}`
+
+Monitoring deployment :eyes:
+
+Posted with :droid:
+```
+
 ### Release Complete
 
 ```
@@ -76,6 +89,14 @@ Release started — {repo_name}
   Branch: {release_branch} -> {production_branch}
 ```
 
+### Release Merged (terminal)
+```
+Release merged — {repo_name}
+  PR:     {pr_url}
+  Branch: {release_branch} -> {production_branch}
+  Monitoring deployment...
+```
+
 ### Release Complete (terminal)
 ```
 Release complete — {repo_name}

package/dist/tools/release/skills/release/references/workflows.md

@@ -39,11 +39,14 @@ Create a release PR and notify Slack.
    ```
    If one exists, show it and ask: "A release PR already exists. Open it instead?"
 
-3. **Generate release notes** — list PRs merged to the release branch since last release:
+3. **Generate release notes** — compare branches to find PRs included in this release:
    ```bash
-   gh pr list --base {release_branch} --state merged --json number,title,author --limit 50 --repo {owner}/{repo}
+   # Get commits in release_branch that aren't in production_branch
+   gh api repos/{owner}/{repo}/compare/{production_branch}...{release_branch} --jq '.commits[].commit.message'
    ```
-   Format as a bulleted list for the PR body.
+   Extract PR numbers from commit messages (e.g. `(#1234)`) and format as a bulleted list for the PR body.
+
+   **Do NOT use** `gh pr list --base {release_branch} --state merged` — that returns ALL historically merged PRs, not just the ones since the last release.
 
 4. **Ask risk level** — use AskUserQuestion:
    - Low Risk (routine release, no breaking changes)
@@ -75,6 +78,40 @@ Create a release PR and notify Slack.
 
 ---
 
+## `/release merge [repo]`
+
+Merge the release PR if all checks are green, then notify Slack.
+
+### Steps
+
+1. **Detect repo** — match cwd or ask user
+
+2. **Find the open release PR:**
+   ```bash
+   gh pr list --search "[RELEASE]" --state open --base {production_branch} --head {release_branch} --json number,title,url,statusCheckRollup --repo {owner}/{repo}
+   ```
+   If no open release PR found, error: "No open release PR found. Run `/release start` first."
+
+3. **Check all status checks:**
+   Parse `statusCheckRollup` from the PR data. Every check must have `conclusion: "SUCCESS"` or `state: "SUCCESS"`.
+
+   If any checks are pending: "CI checks are still running on PR #{number}. Wait for them to finish."
+   If any checks are failing: "CI checks are failing on PR #{number}. Fix them before merging." Show the failing checks.
+
+4. **Confirm with user** — use AskUserQuestion:
+   "All checks are green on PR #{number}. Merge `{release_branch}` → `{production_branch}`?"
+
+5. **Merge the PR:**
+   ```bash
+   gh pr merge {pr_number} --merge --repo {owner}/{repo}
+   ```
+
+6. **Post to Slack** — release merged notification (see `templates.md`).
+
+7. **Confirm to user** — show merge confirmation and Slack post confirmation.
+
+---
+
 ## `/release status`
 
 Check release status across all configured release repos.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orderful/droid",
-  "version": "0.43.0",
+  "version": "0.44.0",
   "description": "AI workflow toolkit for sharing skills, commands, and agents across the team",
   "type": "module",
   "bin": {

package/src/tools/release/skills/release/SKILL.md

@@ -1,7 +1,7 @@
 ---
 name: release
-description: "Release ceremony automation for dev-to-master releases. Use when starting a release, checking release status, or completing a release. User prompts like 'start a release', 'release status', 'release complete'."
-argument-hint: "[start [repo] | status | complete [repo]]"
+description: "Release ceremony automation for dev-to-master releases. Use when starting a release, merging a release, checking release status, or completing a release. User prompts like 'start a release', 'merge the release', 'release status', 'release complete'."
+argument-hint: "[start [repo] | merge [repo] | status | complete [repo]]"
 allowed-tools: [Read, Write, Glob, Grep, Bash, Edit]
 ---
 
@@ -48,6 +48,7 @@ If no repos have `release_branch` set, tell user:
 | Command | Action |
 |---------|--------|
 | `/release start [repo]` | Create release PR + notify Slack |
+| `/release merge [repo]` | Merge release PR (only if checks pass) + notify Slack |
 | `/release status` | Check open release PRs + CI state |
 | `/release complete [repo]` | Post completion to Slack |
 

package/src/tools/release/skills/release/references/templates.md

@@ -24,6 +24,19 @@ Risk emojis:
 - Low Risk: `:large_green_circle:`
 - High Risk: `:warning:`
 
+### Release Merged
+
+```
+:merged-pr: *Release merged — {repo_name}*
+
+*PR:* <{pr_url}|#{pr_number}>
+*Branch:* `{release_branch}` → `{production_branch}`
+
+Monitoring deployment :eyes:
+
+Posted with :droid:
+```
+
 ### Release Complete
 
 ```
@@ -76,6 +89,14 @@ Release started — {repo_name}
   Branch: {release_branch} -> {production_branch}
 ```
 
+### Release Merged (terminal)
+```
+Release merged — {repo_name}
+  PR:     {pr_url}
+  Branch: {release_branch} -> {production_branch}
+  Monitoring deployment...
+```
+
 ### Release Complete (terminal)
 ```
 Release complete — {repo_name}

package/src/tools/release/skills/release/references/workflows.md

@@ -39,11 +39,14 @@ Create a release PR and notify Slack.
    ```
    If one exists, show it and ask: "A release PR already exists. Open it instead?"
 
-3. **Generate release notes** — list PRs merged to the release branch since last release:
+3. **Generate release notes** — compare branches to find PRs included in this release:
    ```bash
-   gh pr list --base {release_branch} --state merged --json number,title,author --limit 50 --repo {owner}/{repo}
+   # Get commits in release_branch that aren't in production_branch
+   gh api repos/{owner}/{repo}/compare/{production_branch}...{release_branch} --jq '.commits[].commit.message'
    ```
-   Format as a bulleted list for the PR body.
+   Extract PR numbers from commit messages (e.g. `(#1234)`) and format as a bulleted list for the PR body.
+
+   **Do NOT use** `gh pr list --base {release_branch} --state merged` — that returns ALL historically merged PRs, not just the ones since the last release.
 
 4. **Ask risk level** — use AskUserQuestion:
    - Low Risk (routine release, no breaking changes)
@@ -75,6 +78,40 @@ Create a release PR and notify Slack.
 
 ---
 
+## `/release merge [repo]`
+
+Merge the release PR if all checks are green, then notify Slack.
+
+### Steps
+
+1. **Detect repo** — match cwd or ask user
+
+2. **Find the open release PR:**
+   ```bash
+   gh pr list --search "[RELEASE]" --state open --base {production_branch} --head {release_branch} --json number,title,url,statusCheckRollup --repo {owner}/{repo}
+   ```
+   If no open release PR found, error: "No open release PR found. Run `/release start` first."
+
+3. **Check all status checks:**
+   Parse `statusCheckRollup` from the PR data. Every check must have `conclusion: "SUCCESS"` or `state: "SUCCESS"`.
+
+   If any checks are pending: "CI checks are still running on PR #{number}. Wait for them to finish."
+   If any checks are failing: "CI checks are failing on PR #{number}. Fix them before merging." Show the failing checks.
+
+4. **Confirm with user** — use AskUserQuestion:
+   "All checks are green on PR #{number}. Merge `{release_branch}` → `{production_branch}`?"
+
+5. **Merge the PR:**
+   ```bash
+   gh pr merge {pr_number} --merge --repo {owner}/{repo}
+   ```
+
+6. **Post to Slack** — release merged notification (see `templates.md`).
+
+7. **Confirm to user** — show merge confirmation and Slack post confirmation.
+
+---
+
 ## `/release status`
 
 Check release status across all configured release repos.