菜单
Merge a target branch into the current branch and push to origin. The ONLY framework skill that pushes to a remote. Requires explicit confirmation. Never rebases. Default-actor skill (agents and captain both use it; captain for captain-* branches, agents for their worktree branches).
用 Codex 或 Claude 帮你安装 复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。
基于 SOC 职业分类
Captain-only. Quality-check, commit, push, create PR, and cut a release in one flow. The "code is ready" command for captain-owned branches. Every PR is a release. Formerly `/release` — v2 rename to captain-actor-verb.
Captain-only. Fetch, merge origin into master, merge unique worktree work into master, and sync all worktrees. The daily rhythm command. NEVER pushes to remote. NEVER rebases. NEVER resets to origin. Formerly `/sync-all` — v2 rename to captain-actor-verb.
Mid-session compact prep — force-commit the handoff, flush coord work, write continuation-framed handoff, direct to /compact.
Post-compact pickup — read continuation handoff, verify state (tree clean, monitors alive, dispatch drift), resume next-action.
Run the quality gate after completing an iteration — review, fix, test, report, auto-commit. No principal approval needed (iteration boundary is auto-approved). Auto-emits a structured dispatch to captain so the small-batch-cadence daemon can pick up for PR landing.
Run the full deep quality gate after completing an implementation phase — review, fix, test, report, squash-commit. Principal approval REQUIRED before commit (phase boundary is NOT auto-approved). Auto-emits phase-complete dispatch to captain for PR landing.
| name | sync |
| description | Merge a target branch into the current branch and push to origin. The ONLY framework skill that pushes to a remote. Requires explicit confirmation. Never rebases. Default-actor skill (agents and captain both use it; captain for captain-* branches, agents for their worktree branches). |
| agency-skill-version | 2 |
| when_to_use | On any non-master branch (worktree agent branch OR captain-* branch), when ready to push committed work to origin. NEVER from master (use PR flow instead). NEVER for auto-invocation — always requires confirmation. |
| argument-hint | [<target-branch>] |
| paths | [] |
| required_reading | ["agency/REFERENCE-GIT-MERGE-NOT-REBASE.md","agency/REFERENCE-SAFE-TOOLS.md"] |
The framework's single authorized push path. Merges a target branch (default origin/master) into the current branch and pushes to origin. Every other push attempt is blocked by hookify (raw git push refused at the hook layer).
Name pattern: noun-verb (sync is both noun and verb by context). No actor qualifier because sync is default-actor — anyone on a non-master branch uses it.
Pushing is a privileged action. Without a single authorized path:
sync enforces: (a) not master, (b) clean tree, (c) single-worktree checkout, (d) confirmation before each destructive step, (e) merge not rebase. The underlying agency/tools/git-push tool adds its own layer of safety (blocks main/master, blocks bare --force).
Before proceeding, Read the files listed in required_reading: frontmatter.
/sync # merge origin/master into current branch, push
/sync origin/main # explicit target
/sync other-branch # merge from a non-default target
./agency/tools/git-captain fetch
git log --oneline origin/<current-branch>..HEAD # if tracking exists
git log --oneline <target>..HEAD # if no tracking
Captain shows commit list; principal verifies scope.
Prompt:
Merge
<target>into<branch>and push toorigin/<branch>?
Do not push without explicit confirmation.
git merge <target>
If conflicts: show conflict files, ask principal to resolve or abort. No auto-resolution.
./agency/tools/git-push <branch>
Never raw git push — blocked by hookify. git-push tool validates target (refuses main/master), checks force-with-lease semantics, and is the only authorized push path in the framework.
Sync complete:
Branch: <branch>
Pushed: N commits to origin/<branch>
Base: <target>
REFERENCE-GIT-MERGE-NOT-REBASE.md).--force-with-lease and only via git-push tool./captain-release (captain) or /pr-submit (agent)./pr-prep. Run QG BEFORE /sync if this push is PR-bound.Pushing is destructive and requires principal confirmation. This skill is intended to be invoked explicitly (principal/captain types /sync) rather than auto-invoked by the model. The skill's own Step 1–2 interactive confirmation is the operative gate; the paths: [] frontmatter keeps the skill out of file-path autocomplete but does not on its own block auto-invocation. If you need a hard per-skill auto-invocation block for a specific future case, disable-model-invocation: true is available per-skill (see REFERENCE-SKILL-CONVENTIONS.md §1).
active (v2, refactored in-place from legacy sync 2026-04-19; name unchanged).
/captain-release — captain's one-flow release (includes sync internally)/pr-submit — agent signals captain; no direct push/pr-captain-land — captain's lifecycle for agent-owned branches/captain-sync-all — captain's master-sync (never pushes; different scope)/worktree-sync — worktree sync (never pushes; local master merge only)agency/tools/git-push — underlying authorized push toolagency/hookify/hookify.block-raw-git-push.md — blocks raw git pushagency/REFERENCE-GIT-MERGE-NOT-REBASE.md — merge disciplineOFFENDERS WILL BE FED TO THE — CUTE — ATTACK KITTENS!