Skip to content

fix: use catch-all handler for merge_test_to_main action #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sweetmantech merged 3 commits into from
Mar 10, 2026
Merged

fix: use catch-all handler for merge_test_to_main action #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6cba9b2
fix: use catch-all action handler for merge_test_to_main prefix matching
sweetmantech Mar 10, 2026
bd7a409
fix: fire-and-forget merge to avoid Slack 3-second timeout
sweetmantech Mar 10, 2026
c88e334
Revert "fix: fire-and-forget merge to avoid Slack 3-second timeout"
sweetmantech Mar 10, 2026
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
10 changes: 5 additions & 5 deletions lib/coding-agent/__tests__/onMergeTestToMainAction.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ function createMockBot() {
}

describe("registerOnMergeTestToMainAction", () => {
it("registers merge_test_to_main: action handler", () => {
it("registers catch-all action handler", () => {
const bot = createMockBot();
registerOnMergeTestToMainAction(bot);
expect(bot.onAction).toHaveBeenCalledWith("merge_test_to_main:", expect.any(Function));
expect(bot.onAction).toHaveBeenCalledWith(expect.any(Function));
});

it("merges test to main and posts success", async () => {
mockMergeGithubBranch.mockResolvedValue({ ok: true });

const bot = createMockBot();
registerOnMergeTestToMainAction(bot);
const handler = bot.onAction.mock.calls[0][1];
const handler = bot.onAction.mock.calls[0][0];

const mockThread = { post: vi.fn() };

Expand All @@ -45,7 +45,7 @@ describe("registerOnMergeTestToMainAction", () => {

const bot = createMockBot();
registerOnMergeTestToMainAction(bot);
const handler = bot.onAction.mock.calls[0][1];
const handler = bot.onAction.mock.calls[0][0];

const mockThread = { post: vi.fn() };

Expand All @@ -61,7 +61,7 @@ describe("registerOnMergeTestToMainAction", () => {

const bot = createMockBot();
registerOnMergeTestToMainAction(bot);
const handler = bot.onAction.mock.calls[0][1];
const handler = bot.onAction.mock.calls[0][0];

const mockThread = { post: vi.fn() };

Expand Down
4 changes: 3 additions & 1 deletion lib/coding-agent/handlers/onMergeTestToMainAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ import { parseMergeTestToMainActionId } from "../parseMergeTestToMainActionId";
* @param bot
*/
export function registerOnMergeTestToMainAction(bot: CodingAgentBot) {
bot.onAction("merge_test_to_main:", async event => {
bot.onAction(async event => {
if (!event.actionId.startsWith("merge_test_to_main:")) return;

const thread = event.thread;

const repo = parseMergeTestToMainActionId(event.actionId);
Expand Down