菜单
Merge a green PR to master and verify CI succeeds. Use when the user says "merge", "land", "land PR", "merge this", or when a PR has passed CI and is ready to merge. This does NOT deploy to production — that is a separate release step.
用 Codex 或 Claude 帮你安装 复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。
基于 SOC 职业分类
| name | land-pr |
| description | Merge a green PR to master and verify CI succeeds. Use when the user says "merge", "land", "land PR", "merge this", or when a PR has passed CI and is ready to merge. This does NOT deploy to production — that is a separate release step. |
Merge a green PR to master and verify CI succeeds. Merge to master triggers the post-merge CI run — it does NOT deploy to production. Production release is a separate manual step.
api tests run against the deployed WorkersProduction deployment is a separate, manual step (deploy the Workers and the Forge app), not triggered by merge.
gh pr view <PR_NUMBER> --json state,isDraft,mergeable,statusCheckRollup,reviewDecision
Verify ALL of these:
If a precondition fails (other than Draft), report which one and stop.
If isDraft === true, this PR may not have been E2E-verified (the Draft gate can skip the E2E job). /land-pr means "I want this merged" — so flip it Ready, wait for the resulting CI run with E2E to go green, then merge. Don't refuse and don't merge without verification.
gh pr ready <PR_NUMBER> --repo ZenUml/conf-mini-sites
Tell the user: "PR is Draft → marking Ready and waiting for CI to verify E2E before merge."
Then delegate to /babysit-pr <PR> (or watch inline). If the new CI run fails, stop and report — do not merge.
If isDraft === false already, skip this step.
Confirm CI is green and the E2E job is among the passed checks (not skipped). Re-run the precondition checks. If anything is not green, stop and report.
Fetch the repo's enabled merge strategies and pick the right flag (GitHub requires one when multiple strategies are enabled):
MERGE_FLAG=$(gh api repos/ZenUml/conf-mini-sites \
--jq 'if .allow_squash_merge and (.allow_merge_commit | not) and (.allow_rebase_merge | not) then "--squash"
elif .allow_rebase_merge and (.allow_merge_commit | not) and (.allow_squash_merge | not) then "--rebase"
else "--merge" end')
gh pr merge <PR_NUMBER> --auto --delete-branch $MERGE_FLAG
Logic: use --squash if only squash is enabled, --rebase if only rebase is enabled, otherwise --merge (GitHub's default when multiple strategies are on). Do not override with --squash or --rebase unless the user explicitly requests it.
Using --auto arms auto-merge so GitHub merges when all checks pass.
gh pr view <PR_NUMBER> --json state
Poll until state is MERGED. Timeout after 5 minutes.
After merge, the CI workflow runs on master. Watch it:
gh run list --repo ZenUml/conf-mini-sites --branch master --limit 1 --json databaseId,status,conclusion
gh run watch <RUN_ID> --repo ZenUml/conf-mini-sites
Report one of:
Do NOT auto-rollback. Report:
The user decides whether to hotfix or revert.
/submit-branch)/validate-branch)Release Conf Mini-Sites to PRODUCTION — deploy the Forge app to its production environment AND both Cloudflare Workers (control + dispatch) to their production environment, via the GitHub-Release → release.yml pipeline. Single app, no variants (the collapse of conf-app's lite/full/diagramly canary). Pre-flight (on master, pushed, CI green, prod prerequisites present) → compose delta-derived release notes → create + publish a vX.Y.Z GitHub Release (which fires the deploy) → wait for the workflow → verify the live build (built-in prod smoke + check-version + a targeted spot check of what shipped). Use when the user wants to release, deploy, ship, cut a release, or promote Conf Mini-Sites to production. Triggers on "release app", "release to prod", "deploy to production", "ship the mini-site app", "cut a release", "release conf-mini-sites", "push to production".
Start the conf-mini-sites Cloudflare Workers locally — the dispatch (serve gateway) and remote (control/provisioner) Workers, each with its own wrangler config. Use when setting up local dev for the Workers, running them with wrangler dev, or debugging grant minting / verification locally.
Monitor and fix failing GitHub Actions CI checks on PRs for ZenUml/conf-mini-sites. Use when the user says "babysit PR", "check PR status", "fix CI", "PR is failing", "watch this PR", "why is CI red", or when used with /loop to continuously monitor a PR. Also use when E2E test flakiness, typecheck issues, or unit test failures block merging. Triggers on any PR monitoring, CI failure diagnosis, or automated fix-and-retry workflow.
Confirm which build of Conf Mini-Sites is live — the deployed Forge app version per environment, the live control + dispatch Worker versions, and (on a real page) that the macro resolved its per-instance reference. Use after a deploy, in a spot check, or in PVT to confirm the expected build is running. Triggers on "check version", "what version is live", "confirm the deploy", "which build is on lite-dev", "is my deploy live".
Create a Confluence page carrying the Conf Mini-Sites Forge macro (key `mini-site`) entirely via REST API — no browser, no editor UI. Use whenever you need a real page that renders a mini-site (to validate a serve/dispatch change, a CSP tweak, or a relative-path resolution fix) without driving the Publisher modal. Optionally pre-publishes a multi-file bundle to the page's instance so it renders live on first load. Triggers on "create test page", "render test", "API test page", "skip the editor", "stand up a mini-site page", or when validating a dispatch/serve fix.
Count Conf Mini-Sites Forge app installs per environment (production / staging / development) plus the delta vs prior snapshots from 1 day and 7 days ago (which sites were added / removed since the last check). Use whenever the user asks "how many installs", "how many tenants", "how many sites have the mini-sites app", "install count", "any new installs", "did anyone uninstall", "active sites", "where is mini-sites installed", "list installs", "show installed sites". Source-of-truth is Atlassian's Forge platform via `forge install list` — there is one app id (no lite/full/diagramly variants), so the skill takes no variant argument.