agentic-forges/forgejo-mcp
Watch
5
0
Fork
You've already forked forgejo-mcp
 1
Code Issues 9 Pull requests 5 Projects Releases 32 Packages 1 Activity

fix: check merged bool in MergePullRequestFn #113

Merged
synath merged 0 commits from refs/pull/113/head into main 2026-05-02 10:03:13 +00:00
Conversation 0 Commits - Files changed 331 +2656 -38710
synath commented 2026-05-02 07:24:31 +00:00 (Migrated from codeberg.org)
Copy link

Problem

MergePullRequestFn discarded all three return values from the SDK's MergePullRequest:

_, _, err := forgejo.Client().MergePullRequest(owner, repo, int64(index), opt)

The SDK returns (bool, *Response, error) where the bool is statusCode == 200. Any non-200 HTTP response from Forgejo — including 405 (branch protection), 409 (conflict), 403 (forbidden) — produced err == nil, causing the tool to always report "Pull request merged successfully" even when the merge didn't happen.

Fix

Capture and check the bool return value. If the merge didn't return 200 and merge_when_checks_succeed is not set, return an error with the actual HTTP status code.

Discovered via

Using this tool against a repo with a branch protection rule that blocked the merge. The false positive made it impossible to diagnose why the merge wasn't landing — we only discovered the real error (405 User not allowed to merge PR) after adding this check.

## Problem `MergePullRequestFn` discarded all three return values from the SDK's `MergePullRequest`: ```go _, _, err := forgejo.Client().MergePullRequest(owner, repo, int64(index), opt) ``` The SDK returns `(bool, *Response, error)` where the bool is `statusCode == 200`. Any non-200 HTTP response from Forgejo — including 405 (branch protection), 409 (conflict), 403 (forbidden) — produced `err == nil`, causing the tool to always report "Pull request merged successfully" even when the merge didn't happen. ## Fix Capture and check the bool return value. If the merge didn't return 200 and `merge_when_checks_succeed` is not set, return an error with the actual HTTP status code. ## Discovered via Using this tool against a repo with a branch protection rule that blocked the merge. The false positive made it impossible to diagnose why the merge wasn't landing — we only discovered the real error (`405 User not allowed to merge PR`) after adding this check.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Compat/Breaking
Breaking change that won't be backward compatible

  
Kind/Bug
Something is not working

  
Kind/Documentation
Documentation changes

  
Kind/Enhancement
Improve existing functionality

  
Kind/Feature
New functionality

  
Kind/OpenSpec
OpenSpec change proposal / spec-driven work

  
Kind/Security
This is security issue

  
Kind/Testing
Issue or pull request related to testing

  
Priority/Critical
The priority is critical

  
Priority/High
The priority is high

  
Priority/Low
The priority is low

  
Priority/Medium
The priority is medium

  
RFC - Request For Comments
Request For Comments — design/spec open for feedback before implementation

  
Reviewed/Confirmed
Issue has been confirmed

  
Reviewed/Duplicate
This issue or pull request already exists

  
Reviewed/Invalid
Invalid issue

  
Reviewed/Won't Fix
This issue won't be fixed

  
Status/Abandoned
Somebody has started to work on this but abandoned work

  
Status/Blocked
Something is blocking this issue or pull request

  
Status/Need More Info
Feedback is required to reproduce issue or to continue work

  
approved
Spec/deliverable approved (set by castra finish)

  
area:client-host
Issues in the Phase 1 client host (pi.dev) lane

  
area:item-interaction
Issues in the item interaction foundation lane

  
area:meta-tooling
Issues in the meta-tooling lane (castra, agent coordination, skill maintenance)

  
area:operator-dev-loop
Issues in the operator and development loop lane

  
area:repository-hygiene
Issues in the repository hygiene and small-fix lane

  
area:typescript-sdk
Issues in the TypeScript SDK / server parity lane

  
area:website
Issues for public website and domain-facing surfaces

  
blocked
Agent cannot proceed; prerequisite missing or ambiguous input

  
bug
Bounded defect fix; handled directly without an openspec change

  
castra:bot-active
castra is actively working this

  
castra:human
Castra escalated — human must look closely (remove to hand back)

  
change
Feature or design work; routed through the openspec change flow

  
checker:tobi
Trigger castra checker-tobi — print the version step + a haiku-written version-info background

  
close-suggested
intake: recommended for closing (noise/obsolete)

  
code
Trigger castra code bot — implement issue, push branch, open PR

  
copilot-conflict
Trigger Copilot cloud agent to resolve an existing PR merge conflict

  
deferred
Out of current scope; excluded from triage and routing until removed

  
dependencies
Pull requests that update a dependency file

  
docs-ok
Authorable-surface PR checked — no docs/modding change needed (skips docs-modding gate)

  
enhancement

   
fast-track
Human-scoped — portfolio-em sends straight to code (skip intake)

  
groom:close-suggested
groom: recommended for closing (noise/obsolete)

  
hermes-attempted
Hermes attempted but produced no changes

  
hermes-needs-clarification
Quality gate flagged, needs human input

  
hermes-ready
Ready for hermes to process

  
hermes-review
Hermes PR awaiting review

  
hermes-wip
Hermes is working on this

  
human
A human must act before any agent continues (fullsend escalation)

  
human-required
Hermes gave up after 3 attempts

  
intake
Trigger castra-intake — assess one issue end-to-end (ADR-0051 entry)

  
merge
Authorize castra-merge: bring up to date with main, resolve conflicts, merge when CI green

  
merge-conflict
PR conflicts with the base branch — resolve before merge

  
needs-scope
groom: real but needs scoping/decision

  
no-concept-doc

   
no-demo
Refactor/CI-only PR with no demo to show (skips demo gate)

  
plan-approved
Plan reviewed and approved — castra dispatches implementer on next run

  
plan-needs-revision
castra plan-implement: AI returned blocked — review reason in latest *update — blocked PR comment

  
portfolio:infrastructure
Portfolio class: build/test/agent/CI/telemetry/dev-loop/repo operations

  
portfolio:mixed
Portfolio class: both product-facing and infrastructure/tooling work are load-bearing

  
portfolio:product
Portfolio class: product-facing behavior, authored world semantics, clients, or product promise

  
portfolio:unknown
Portfolio class: insufficient evidence to classify yet

  
prioritize
Trigger castra prioritize bot — RICE-scores via Claude

  
prioritized
RICE score assigned (detail in comment) — set by the portfolio layer

  
priority:high
RICE priority: high

  
priority:low
RICE priority: low

  
priority:medium
RICE priority: medium

  
propose
Trigger castra-propose — author an OpenSpec proposal (spec_first, canon-clean)

  
ready
groom: bounded + agent-implementable

  
retro
Trigger castra retro bot — files improvement proposals

  
retro-proposal
Improvement proposed by castra-retro

  
review
Trigger castra review bot — verdict via gh pr review

  
stage:backlog
Pipeline stage: not yet assessed

  
stage:blocked
Pipeline stage: blocked

  
stage:code
Pipeline stage: implementing

  
stage:done
Pipeline stage: merged/closed

  
stage:intake
Pipeline stage: intake assessment (ADR-0051)

  
stage:merge
Pipeline stage: READY — awaiting human merge

  
stage:propose
Pipeline stage: authoring an OpenSpec proposal (spec_first)

  
stage:review
Pipeline stage: in review

  
stage:waiting
Pipeline stage: waiting on a human/reporter

  
status:waiting
Agent done, waiting for human response

  
tracker
Living issue used to coordinate triage lanes

  
triage
Trigger castra triage bot — info-sufficiency assessment + label suggestion

No labels
Compat/Breaking
Kind/Bug
Kind/Documentation
Kind/Enhancement
Kind/Feature
Kind/OpenSpec
Kind/Security
Kind/Testing
Priority/Critical
Priority/High
Priority/Low
Priority/Medium
RFC - Request For Comments
Reviewed/Confirmed
Reviewed/Duplicate
Reviewed/Invalid
Reviewed/Won't Fix
Status/Abandoned
Status/Blocked
Status/Need More Info
approved
area:client-host
area:item-interaction
area:meta-tooling
area:operator-dev-loop
area:repository-hygiene
area:typescript-sdk
area:website
blocked
bug
castra:bot-active
castra:human
change
checker:tobi
close-suggested
code
copilot-conflict
deferred
dependencies
docs-ok
enhancement
fast-track
groom:close-suggested
hermes-attempted
hermes-needs-clarification
hermes-ready
hermes-review
hermes-wip
human
human-required
intake
merge
merge-conflict
needs-scope
no-concept-doc
no-demo
plan-approved
plan-needs-revision
portfolio:infrastructure
portfolio:mixed
portfolio:product
portfolio:unknown
prioritize
prioritized
priority:high
priority:low
priority:medium
propose
ready
retro
retro-proposal
review
stage:backlog
stage:blocked
stage:code
stage:done
stage:intake
stage:merge
stage:propose
stage:review
stage:waiting
status:waiting
tracker
triage
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
agentic-forges/forgejo-mcp!113
No description provided.