Files

Defame1297 38f1ba4e03 fix(kyberforge): bridge apm content to Claude Code's flat plugin discovery

Claude Code's (and Copilot's) native plugin installer has zero awareness of
.apm/ nesting -- it convention-scans only flat skills/, agents/, commands/,
hooks.json at each plugin's root. Confirmed via strings on the installed
claude binary and live installs of git@holocron/gitea@holocron/kyberforge@
holocron, all reporting Skills(0) Agents(0) Hooks(0) post ADR-0015's apm
conversion. Root cause (apm_cli/core/plugin_manifest.py): apm's plugin.json
compiler deliberately strips skills/agents/commands keys, assuming the host
already auto-discovers those convention directories -- it has no model of
.apm/ being host-visible at all. Separately, apm's own bundle exporter
(apm_cli/bundle/plugin_exporter.py, behind `apm pack --format plugin`)
implements the correct .apm/ -> flat mapping, but only ever targeted
build/<name>-<version>/, a path nothing in marketplace.json's source: points
at.

scripts/sync-plugin-content.sh wraps that bundle exporter and copies its
agents/, skills/, commands/, instructions/, extensions/, and merged
hooks.json back into each plugin's own root as a second tracked
compiled-output category -- same governance status as
.claude-plugin/plugin.json: generated from .apm/, never hand-edited. tests/
subdirectories are excluded from the mirror (dev fixtures, not host-visible
runtime content; several hardcode a relative repo-root walk-up sized for the
.apm/-nested depth, which breaks when duplicated one level shallower).
Applied for real across all 6 plugins and verified two ways: `claude plugin
validate --strict` passes on every real plugin directory, and a live
`claude --plugin-dir <path> -p "list skills/agents"` behavioral test
confirms content is now actually discovered.

Also, from the same issue #90 review round:
- scripts/check-manifests.sh pointed at each plugin's root-level plugin.json
  (checking skills/hooks/mcpServers/agents pointer fields) -- that file was a
  stale near-duplicate of .claude-plugin/plugin.json nothing else read or
  wrote, now deleted across all 6 plugins. check-manifests.sh is rewritten to
  validate .claude-plugin/plugin.json instead, and drops the pointer-field
  checks entirely (nothing to check -- those fields are correctly absent by
  design). Content-presence drift is now check-plugin-content-sync's job, a
  new pre-push hook wired in .pre-commit-config.yaml.

docs/adr/0017 records the root cause and decision in full, including two
rejected alternatives (patching plugin.json's path fields directly -- apm's
compiler strips them on every run; pointing marketplace.json at apm pack's
build/ output -- a version-suffixed non-source directory nothing can install
from without an extra build step). ADR-0015 and CONTEXT.md are updated to
point at it.

Refs: #90

2026-08-13 16:59:03 +00:00

3.8 KiB

Raw Blame History

topic, source_keys

topic

source_keys

merging

gitea-mcp-repo

context7-websites-gitea

context7-gitea-tea-cli

Merge workflow

Two independent gates

Before merging, two things can each independently block the merge, and only one of them is visible from get_status:

CI status — pull_request_read method: "get_status" returns the combined commit status for the PR's head commit. This reflects CI/build checks only.
Review and branch-protection state — required approval counts, an allowlist of required approvers/teams, whether requested reviewers have reviewed, and stale-approval handling (an approval given before new commits were pushed may be auto-dismissed or ignored, depending on repo settings). None of this is exposed via get_status — it is enforced server-side by the merge call itself, and repository admins are not exempt from it by default (an explicit "administrators must follow branch protection" setting is what removes that bypass).

A green get_status does not mean the merge will succeed. Treat both gates as independently checkable, and expect pull_request_write method: "merge" to return an error if branch-protection requirements aren't met even when CI is passing.

`pull_request_write method: "merge"`

Parameters (in addition to owner, repo, pull_number — see references/pull-requests.md for the full parameter list):

merge_style (string, optional, default "merge") — "merge" | "rebase" | "rebase-merge" | "squash" | "fast-forward-only"
title (string, optional) — override the merge/squash commit's title
message (string, optional) — merge commit message (for squash, this becomes the squash commit's message — see the auto-close gotcha below)
delete_branch (boolean, optional) — delete the head branch after a successful merge
force_merge (boolean, optional) — merge even if checks are failing; use only when the user explicitly asks to override a failing CI status
merge_when_checks_succeed (boolean, optional) — queue the merge to happen automatically once checks pass, instead of merging immediately
head_commit_id (string, optional) — expected head SHA; supplying it lets the server detect if the branch moved since you last read it (conflict detection) rather than merging a stale diff

Recommended sequence

Call pull_request_read method: "get_status" first. Report CI status to the user. Do not block the merge attempt solely because CI is failing unless the user asks you to stop — but do surface it before proceeding.
Call pull_request_write method: "merge" with the chosen merge_style (ask the user if unspecified; do not default to squash silently, since squash has the closing-keyword implication below) and delete_branch: true unless told otherwise.
If branch-protection requirements block the merge, the call itself will return the error — report it verbatim rather than retrying with force_merge unless the user explicitly asks to override.

Merging does not auto-close linked issues

Gitea has no GitHub-style "merge triggers close" event. It does parse closing keywords (Fixes #N, Closes #N) in commit messages that land on the default branch — so a regular (non-squash) merge, which preserves each original commit message, can auto-close an issue this way if one of those commits used a closing keyword. A squash merge rewrites history into a single commit, so whether the keyword survives depends entirely on what message (or the default squash message) ends up being.

After any merge, call issue_read method: "get" (in gitea-issues) on any issue the PR references before deciding whether to close it explicitly. Closing an already-closed issue is a harmless no-op, but don't assume a manual close is always needed, and don't assume it never is.

3.8 KiB Raw Blame History