charles/claude-hooks

Fork

You've already forked claude-hooks

Code Issues 10 Pull requests Projects Releases Packages 1 Wiki Activity Actions

FM-3 Migrate agents to forge-mcp, drop forgejo-mcp from image + patches #654

New issue

Closed

opened 2026-05-01 18:32:46 +00:00 by claude-desktop · 0 comments

claude-desktop commented

2026-05-01 18:32:46 +00:00

Collaborator

Copy link

User story

As a platform engineer, I want every agent skill, image, and config switched from mcp__forgejo__* (upstream binary) to mcp__forge__* (our wrapper), so that the upstream binary + patches/ directory disappear from this repo and we own the entire forge-MCP surface.

Acceptance criteria

Skill rewrites

Every /skills/*.md file is rewritten to call mcp__forge__* tools. git grep "mcp__forgejo__" under /skills/ returns zero hits.
One-time grep + sed pass applies the rename table:
- get_issue_by_index → get_issue
- list_repo_issues → list_issues
- list_issue_comments → list_comments
- create_issue_comment → create_comment
- create_review_requests → request_reviewers
- delete_review_requests → remove_review_request
- submit_pull_review → submit_review
- get_pull_request_by_index → get_pull_request
- list_repo_pull_requests → list_pull_requests
- (full table in the migration commit message for review)
Skills calling dropped tools (notifications, org admin, branch/repo CRUD, search) are rewritten to use surviving equivalents or fail loudly so the loss is visible.

Image rebuild

Dockerfile drops the multi-stage forgejo-mcp build. The patches/ directory is deleted. claude-hooks:dev rebuild produces a smaller image with no Go toolchain in the build stage.
apps/forge-mcp build artifact is copied in at /usr/local/bin/forge-mcp.
config/mcp-builtin.json carries exactly one entry: forge, command forge-mcp, transport stdio. (Per-type shape from specs/drop-default-builtins.md if that spec ships first; legacy single-entry shape otherwise.)

Agent-env-sync wiring

agent-env-sync.renderForInstance injects FORGE_TYPE, FORGE_REPO, FORGE_TOKEN into the rendered .claude.json::mcpServers.forge.env per dispatch.
For multi-repo dispatches (foreman cross-repo edits), FORGE_TOKENS (plural JSON) is rendered with the per-forge token map.

Memory + docs

~/.claude/projects/.../memory/mcp_merge_bug.md is deleted (the patches it documented no longer exist).
New docs/forge-mcp.md documents the tool surface, env contract, and per-forge differences (e.g. GitLab approve-only review).
docs/credentials.md updated: FORGE_TOKEN env var replaces FORGEJO_ACCESS_TOKEN for agent containers.
~/.claude/CLAUDE.md reference to forgejo-mcp under "Forgejo / issue tracking" updated to forge-mcp once cut over.

Verification

Boss agent dispatches a real PR through the boss → reviewer → merge loop on charles/claude-hooks (Forgejo) using only mcp__forge__* calls. Loop closes successfully.
Same loop on a GitLab test repo (gates on FM-4 standing one up — coordinate or stub).

Out of scope

recommended-catalog.json for non-builtin MCPs (covered in specs/drop-default-builtins.md).
The host's claude-desktop config (foreman + ops continue using upstream forgejo-mcp for MCP-via-API convenience).

References

specs/forge-mcp-multi-forge.md §Story FM-3
apps/server/src/infrastructure/agent-env-sync/render-for-instance.ts
Dockerfile, patches/ — to be cleaned up
Depends on FM-1, FM-2.

## User story As a platform engineer, I want every agent skill, image, and config switched from `mcp__forgejo__*` (upstream binary) to `mcp__forge__*` (our wrapper), so that the upstream binary + `patches/` directory disappear from this repo and we own the entire forge-MCP surface. ## Acceptance criteria ### Skill rewrites - [ ] Every `/skills/*.md` file is rewritten to call `mcp__forge__*` tools. `git grep "mcp__forgejo__"` under `/skills/` returns zero hits. - [ ] One-time grep + sed pass applies the rename table: - `get_issue_by_index` → `get_issue` - `list_repo_issues` → `list_issues` - `list_issue_comments` → `list_comments` - `create_issue_comment` → `create_comment` - `create_review_requests` → `request_reviewers` - `delete_review_requests` → `remove_review_request` - `submit_pull_review` → `submit_review` - `get_pull_request_by_index` → `get_pull_request` - `list_repo_pull_requests` → `list_pull_requests` - (full table in the migration commit message for review) - [ ] Skills calling dropped tools (notifications, org admin, branch/repo CRUD, search) are rewritten to use surviving equivalents or fail loudly so the loss is visible. ### Image rebuild - [ ] `Dockerfile` drops the multi-stage `forgejo-mcp` build. The `patches/` directory is deleted. `claude-hooks:dev` rebuild produces a smaller image with no Go toolchain in the build stage. - [ ] `apps/forge-mcp` build artifact is copied in at `/usr/local/bin/forge-mcp`. - [ ] `config/mcp-builtin.json` carries exactly one entry: `forge`, command `forge-mcp`, transport `stdio`. (Per-type shape from `specs/drop-default-builtins.md` if that spec ships first; legacy single-entry shape otherwise.) ### Agent-env-sync wiring - [ ] `agent-env-sync.renderForInstance` injects `FORGE_TYPE`, `FORGE_REPO`, `FORGE_TOKEN` into the rendered `.claude.json::mcpServers.forge.env` per dispatch. - [ ] For multi-repo dispatches (foreman cross-repo edits), `FORGE_TOKENS` (plural JSON) is rendered with the per-forge token map. ### Memory + docs - [ ] `~/.claude/projects/.../memory/mcp_merge_bug.md` is deleted (the patches it documented no longer exist). - [ ] New `docs/forge-mcp.md` documents the tool surface, env contract, and per-forge differences (e.g. GitLab approve-only review). - [ ] `docs/credentials.md` updated: `FORGE_TOKEN` env var replaces `FORGEJO_ACCESS_TOKEN` for agent containers. - [ ] `~/.claude/CLAUDE.md` reference to `forgejo-mcp` under "Forgejo / issue tracking" updated to `forge-mcp` once cut over. ### Verification - [ ] Boss agent dispatches a real PR through the boss → reviewer → merge loop on `charles/claude-hooks` (Forgejo) using only `mcp__forge__*` calls. Loop closes successfully. - [ ] Same loop on a GitLab test repo (gates on FM-4 standing one up — coordinate or stub). ## Out of scope - `recommended-catalog.json` for non-builtin MCPs (covered in `specs/drop-default-builtins.md`). - The host's claude-desktop config (foreman + ops continue using upstream `forgejo-mcp` for MCP-via-API convenience). ## References - `specs/forge-mcp-multi-forge.md` §Story FM-3 - `apps/server/src/infrastructure/agent-env-sync/render-for-instance.ts` - `Dockerfile`, `patches/` — to be cleaned up - Depends on **FM-1**, **FM-2**.

claude-desktop added the

area:agents

type:user-story

labels

2026-05-01 18:35:45 +00:00

claude-desktop added this to the Forge MCP — multi-forge milestone

2026-05-01 18:35:56 +00:00

claude-desktop added a new dependency

2026-05-01 20:35:35 +00:00

#655 FM-4 GitLab end-to-end smoke (real repo, dispatch loop, board render)

code-lead was assigned by claude-desktop

2026-05-01 20:36:13 +00:00

code-lead referenced this issue from a commit

2026-05-01 20:55:08 +00:00

chore(forge-mcp): FM-3 migrate agents to forge-mcp, drop forgejo-mcp + patches

code-lead referenced this issue from a pull request that will close it,

2026-05-01 20:55:23 +00:00

FM-3 migrate agents to forge-mcp, drop forgejo-mcp + patches #687

code-lead referenced this issue from a commit

2026-05-01 21:07:41 +00:00

chore(forge-mcp): FM-3 migrate agents to forge-mcp, drop forgejo-mcp + patches

charles closed this issue

2026-05-01 21:23:52 +00:00

charles referenced this issue from a commit

2026-05-01 21:23:54 +00:00

FM-3 migrate agents to forge-mcp, drop forgejo-mcp + patches (#687)

No Branch/Tag specified

main

chore/sync-pre-push-from-forge-base

fix/flows-yaml-dispatch-identity

feat/board-tap-to-assign

dev/1107

code-lead/1106

code-lead/1108

dev/1104

code-lead/1103

code-lead/1080

dev/1087

feat/flows-yaml-ci-events

chore/board-drop-stalled-and-density-controls

fix/flows-yaml-routes-always-register

flows-yaml/api-defaults

dev/1023

fix/event-log-history-bleed

fix/janitor-fix-ci-logs-and-cap

dev/1022

fix/board-card-provider

code-lead/1036

dev/1025

code-lead/1020

dev/1017

code-lead/1026

feat/web-shortcut-registry-1018

dev/1015

code-lead/1009

code-lead/1008

dev/975

dev/969

dev/973

dev/967

code-lead/968

code-lead/953

dev/970

dev/976

code-lead/966

code-lead/956

code-lead/951

dev/962

dev/963

dev/977

dev/955

dev/983

dev/961

dev/974

code-lead/950

code-lead/939

dev/941

dev/940

dev/937

dev/938

dev/936

dev/935

feat/web-i18n-fr-locale

feat/spec-editor-ui-polish

chore/drop-legacy-compat

fix/skills-drop-preview-pane

fix/882-skills-safety-rail

dev/911

dev/909

dev/923

dev/917

dev/915

feat/879-sr11-m2-drop-legacy-skill

code-lead/873

dev/881

code-lead/869

dev/867

code-lead/845

code-lead/843

code-lead/844

dev/837

dev/861

dev/849

code-lead/837

code-lead/842

fix/dedup-rebase-inflight

dev/838

code-lead/847

dev/833

code-lead/848

pr/838

code-lead/841

feat/settings-save-bar/836

code-lead/840

dev/846

code-lead/839

dev/832

fix/board-sse-stale-cache

dev/834

dev/835

feat/settings-breadcrumbs

feat/forge-oauth-credentials

refactor/service-config-consolidation

feat/agent-tokens-to-secrets

feat/gitlab-oauth-to-db

feat/authelia-rip-and-voice-fixes

fix/rebase-storm-and-dead-letter

code-lead/797

code-lead/796

dev/811

code-lead/798

dev/810

code-lead/795

dev/808

code-lead/794

dev/805

dev/802

dev/803

feat/avatar-menu-settings-entry

feat/per-agent-token-tracking

dev/793

dev/747

dev/752

code-lead/790

code-lead/759

dev/756

dev/760

dev/741

dev/767

dev/740

dev/709

dev/644

dev/637

boss/614

dev/600

dev/611

dev/585

fix/login-bonus-fixes

boss/544

dev/542

refactor/api-prefix-and-session-gate

dev/489

boss/531

boss/518

dev/499

boss/516

dev/530

dev/517

dev/519

dev/515

dev/522

dev/503

dev/471

boss/329

dev/417

dev/418

dev/402

boss/327

dev/334

dev/332

boss/326

boss/325

dev/331

boss/324

boss/323

boss/322

dev/294

test/s11-task-analytics

dev/262

boss/270

dev/268

foreman/ui-consolidation-spec

dev/234

boss/196

boss/176

boss/164

fix/124-session-persist-bind

boss/52

dev/87

boss/73

dev/77

dev/81

dev/82

boss/79

dev/42

dev/35

boss/7

No results found.

Labels

Clear labels

area:agents

Agent types, pool scheduling, per-instance config

area:dashboard

Dashboard UI and observability surfaces

area:database

DB layer — schema, migrations, ORM, raw SQL

area:design

UI/UX mockup work — routes to designer agent

area:design-review

Design review dispatch — routes to design-reviewer agent

area:flows

Flow runner — YAML loader, executor, op registry, expression eval

area:infra

Deployment, isolation, containers, systemd units

area:meta

Tracking, scaffolding, project setup

area:security

Security — routes to reviewer-security (opus)

area:sessions

Session-id store, Claude SDK resume logic

area:webhook

Forgejo webhook routing and handlers

area:workdir

Clone cache, worktrees, git identity

security

Security-sensitive issue

Tracking or decisions, not implementation work

No labels

Milestone

Clear milestone

No items

No milestone

Forge MCP — multi-forge

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

code-lead

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.

Blocks

#655 FM-4 GitLab end-to-end smoke (real repo, dispatch loop, board render)

charles/claude-hooks

Reference

charles/claude-hooks#654

Reference in a new issue

Repository

charles/claude-hooks

Title

Body

No description provided.

Delete branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?

Rows
Columns