Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 4 additions & 18 deletions packages/agents/content/skills/merge-gh-pr/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,7 @@ When `deletion_strategy == 'remote'`, resolve the head-repo coordinates and call
gh api -X DELETE "repos/{headRepositoryOwner.login}/{headRepository.name}/git/refs/heads/{headRefName}"
```

Capture stdout, stderr, and the exit code.

- **On success:** set `remote_deletion_status = "deleted"`.
- **On failure:** print `warning: Failed to delete remote branch '{headRefName}': {stderr}` to stderr, but **do not** exit non-zero — the merge itself succeeded, and re-deleting a leftover branch is trivial. Set `remote_deletion_status = "deletion-failed: {first line of stderr}"`.

For `deletion_strategy in {both, none}`, set `remote_deletion_status` directly from the strategy without making an API call: `both` → `"deleted"` (the prior `gh pr merge --delete-branch` handled it; if `gh pr merge` succeeded, the remote ref is gone); `none` → `"preserved"`.

Symmetrically, set `local_deletion_status`: `both` → `"deleted"`; `remote` or `none` → `"preserved"`.
If the call exits non-zero, print `warning: Failed to delete remote branch '{headRefName}': {stderr}` to stderr but **do not** exit non-zero. The merge itself succeeded, and re-deleting a leftover branch is trivial.

### 7. Capture merge result

Expand Down Expand Up @@ -165,28 +158,21 @@ PR: {url}
Merged at: {mergedAt}
Merge commit: {mergeCommit.oid}
Strategy: {strategy}
Branch: {headRefName} (local: {local_deletion_status}, remote: {remote_deletion_status})
Branch: {headRefName}

## Body

{body as submitted}
```

The branch line has four canonical renderings, depending on `deletion_strategy` and the outcome of the post-merge API call:

- `Branch: my-branch (local: deleted, remote: deleted)` — `both`, success
- `Branch: my-branch (local: preserved, remote: deleted)` — `remote`, success
- `Branch: my-branch (local: preserved, remote: deletion-failed: {reason})` — `remote`, API call failed
- `Branch: my-branch (local: preserved, remote: preserved)` — `none`

## Completion

```
Merged: {url}
Commit: {mergeCommit.oid}
Strategy: {strategy}
Branch: {headRefName} (local: {local_deletion_status}, remote: {remote_deletion_status})
Branch: {headRefName}
Artifact saved: {artifact path}
```

Nothing else.
Local state is intentionally left untouched; removing the merged branch is left to the user. Do not append local-branch cleanup steps or advice. Do not report this state to the user.
Loading