Skip to content
Merged
Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ integration PRs, follows `main` through production, and pauses after failures.

## Install

Install the reviewed `v0.2.2` source commit directly from GitHub:
Install the reviewed `v0.2.3` source commit directly from GitHub:

```bash
python3 -m pip install \
'deploybot-merge-queue[mcp] @ git+https://github.com/Forward-Future/DeployBot.git@2a502a74251e2fbb07e5b4769ce99687235df5ae'
'deploybot-merge-queue[mcp] @ git+https://github.com/Forward-Future/DeployBot.git@c9e3d6976b372ef5bcbb2986b0afd6bb1afe9470'
deploybot init
```

Expand Down Expand Up @@ -86,7 +86,7 @@ aligned with `pipeline.ci_workflows`. The privileged worker never checks out or
executes pull-request code. Pin the Action to the full reviewed release commit:

```yaml
- uses: Forward-Future/DeployBot@2a502a74251e2fbb07e5b4769ce99687235df5ae
- uses: Forward-Future/DeployBot@c9e3d6976b372ef5bcbb2986b0afd6bb1afe9470
```

The Action uses GitHub's built-in workflow token. GitHub intentionally does not
Expand Down
2 changes: 1 addition & 1 deletion adapters/claude-code/.claude-plugin/plugin.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "deploybot",
"version": "0.2.2",
"version": "0.2.3",
"description": "DeployBot: a provider-neutral GitHub merge queue for coding agents",
"author": {
"name": "DeployBot contributors"
Expand Down
2 changes: 1 addition & 1 deletion adapters/claude-code/.mcp.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"command": "uvx",
"args": [
"--from",
"deploybot-merge-queue[mcp] @ git+https://github.com/Forward-Future/DeployBot.git@2a502a74251e2fbb07e5b4769ce99687235df5ae",
"deploybot-merge-queue[mcp] @ git+https://github.com/Forward-Future/DeployBot.git@c9e3d6976b372ef5bcbb2986b0afd6bb1afe9470",
"deploybot-mcp"
]
}
Expand Down
2 changes: 1 addition & 1 deletion adapters/codex/agent-merge-queue/.codex-plugin/plugin.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "deploybot",
"version": "0.2.2",
"version": "0.2.3",
"description": "Review, queue, and land pull requests through a shared GitHub merge queue",
"author": {
"name": "DeployBot contributors"
Expand Down
2 changes: 1 addition & 1 deletion adapters/codex/agent-merge-queue/.mcp.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"command": "uvx",
"args": [
"--from",
"deploybot-merge-queue[mcp] @ git+https://github.com/Forward-Future/DeployBot.git@2a502a74251e2fbb07e5b4769ce99687235df5ae",
"deploybot-merge-queue[mcp] @ git+https://github.com/Forward-Future/DeployBot.git@c9e3d6976b372ef5bcbb2986b0afd6bb1afe9470",
"deploybot-mcp"
]
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
interface:
display_name: "DeployBot"
short_description: "Inspect and manage agent merge queues"
default_prompt: "Use $deploybot to show the current merge queue and explain what is ready, waiting, or blocked."
short_description: "Inspect and operate the delivery pipeline"
default_prompt: "Use $deploybot to show threads, pull requests, queue, CI, deployment, and any blocker or repair handoff."
dependencies:
tools:
- type: "mcp"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
interface:
display_name: "Manage Merge Queue"
short_description: "Review, queue, and land pull requests safely"
default_prompt: "Use $manage-merge-queue to review and enqueue my pull request, then coordinate the merge queue."
short_description: "Review and deliver pull requests safely"
default_prompt: "Use $manage-merge-queue to review my pull request, record deploy intent, and let DeployBot deliver it."
dependencies:
tools:
- type: "mcp"
Expand Down
2 changes: 1 addition & 1 deletion adapters/cursor/.cursor/mcp.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"command": "uvx",
"args": [
"--from",
"deploybot-merge-queue[mcp] @ git+https://github.com/Forward-Future/DeployBot.git@2a502a74251e2fbb07e5b4769ce99687235df5ae",
"deploybot-merge-queue[mcp] @ git+https://github.com/Forward-Future/DeployBot.git@c9e3d6976b372ef5bcbb2986b0afd6bb1afe9470",
"deploybot-mcp"
]
}
Expand Down
4 changes: 2 additions & 2 deletions examples/github-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ jobs:
with:
ref: ${{ github.event.repository.default_branch }}
persist-credentials: false
# v0.2.2 implementation; keep the full commit for privileged workflows.
- uses: Forward-Future/DeployBot@2a502a74251e2fbb07e5b4769ce99687235df5ae
# v0.2.3 implementation; keep the full commit for privileged workflows.
- uses: Forward-Future/DeployBot@c9e3d6976b372ef5bcbb2986b0afd6bb1afe9470
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "deploybot-merge-queue"
version = "0.2.2"
version = "0.2.3"
description = "DeployBot: a provider-neutral GitHub merge queue for coding agents"
readme = "README.md"
license = "MIT"
Expand Down
4 changes: 2 additions & 2 deletions skills/deploybot/agents/openai.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
interface:
display_name: "DeployBot"
short_description: "Inspect and manage agent merge queues"
default_prompt: "Use $deploybot to show the current merge queue and explain what is ready, waiting, or blocked."
short_description: "Inspect and operate the delivery pipeline"
default_prompt: "Use $deploybot to show threads, pull requests, queue, CI, deployment, and any blocker or repair handoff."
4 changes: 2 additions & 2 deletions skills/manage-merge-queue/agents/openai.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
interface:
display_name: "Manage Merge Queue"
short_description: "Review, queue, and land pull requests safely"
default_prompt: "Use $manage-merge-queue to review and enqueue my pull request, then coordinate the merge queue."
short_description: "Review and deliver pull requests safely"
default_prompt: "Use $manage-merge-queue to review my pull request, record deploy intent, and let DeployBot deliver it."
2 changes: 1 addition & 1 deletion src/agent_merge_queue/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""DeployBot: a provider-neutral GitHub merge queue for coding agents."""

__version__ = "0.2.2"
__version__ = "0.2.3"
9 changes: 8 additions & 1 deletion tests/test_mcp.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
from __future__ import annotations

import importlib.util
import unittest
from subprocess import CompletedProcess
from unittest.mock import patch

from agent_merge_queue.mcp_server import _run

MCP_AVAILABLE = importlib.util.find_spec("mcp") is not None
if MCP_AVAILABLE:
from agent_merge_queue.mcp_server import _run
else:
_run = None


@unittest.skipUnless(MCP_AVAILABLE, "the optional MCP extra is not installed")
class McpTest(unittest.TestCase):
def test_diagnose_can_return_failed_report_payload(self) -> None:
completed = CompletedProcess(
Expand Down
2 changes: 1 addition & 1 deletion tests/test_skill.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

ROOT = Path(__file__).resolve().parents[1]
CANONICAL = ROOT / "skills" / "deploybot" / "SKILL.md"
RELEASE_COMMIT = "2a502a74251e2fbb07e5b4769ce99687235df5ae"
RELEASE_COMMIT = "c9e3d6976b372ef5bcbb2986b0afd6bb1afe9470"
CHECKOUT_COMMIT = "9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0"


Expand Down