ff
Skill0 starsChanged 6 days ago0BSDView on GitHub
Context Circuit's /ff — fast-forward this machine's base branches to their remotes, and after a person says their merge or pull request merged, offer that together with completing the delivered plans.
In this repository47 other files it gives its agents.
- AGENTS.mdAGENTS.md
- CLAUDE.mdCLAUDE.md
- .cursor/rules/context-circuit.mdcCursor rule
- cc-cliSkill
- cc-completeSkill
- cc-deliverSkill
- cc-directSkill
- cc-dispatchSkill
- cc-intentSkill
- cc-knowledgeSkill
- cc-planSkill
- cc-reviewSkill
- cc-stackedSkill
- cc-system-designSkill
- cc-workspaceSkill
- cc-worktreeSkill
- cc-writingSkill
- cc-cliSkill
- cc-completeSkill
- cc-deliverSkill
- cc-directSkill
- cc-dispatchSkill
- cc-intentSkill
- cc-knowledgeSkill
- cc-planSkill
- cc-reviewSkill
- cc-stackedSkill
- cc-system-designSkill
- cc-workspaceSkill
- cc-worktreeSkill
- cc-writingSkill
- ffSkill
- cc-cliSkill
- cc-completeSkill
- cc-deliverSkill
- cc-directSkill
- cc-dispatchSkill
- cc-intentSkill
- cc-knowledgeSkill
- cc-planSkill
- cc-reviewSkill
- cc-stackedSkill
- cc-system-designSkill
- cc-workspaceSkill
- cc-worktreeSkill
- cc-writingSkill
- ffSkill
The file
We split this skill into the rules it gives an agent
3 rules. About 0 are common, 1 is distinctive, and 2 are very specific to this project.
≈0
Common · estimate
Many files like this have a rule of this kind.
≈1
Distinctive · estimate
This author's own choices. Worth a look.
2
Very specific
Tied to their project's names, files or tools. Probably skip.
- Common
- Distinctive
- Very specific
- Very specific: line 49
When workspace sync moved the workspace it returns check_recommended: run check and report what came in, including any finding the pull …
- Distinctive: line 57
When a person says their delivered work merged — "PR merged", "the MR is in", "sudah di-merge" — they have not asked for anything yet.
- Very specific: line 73
Leave worktrees and cc/* branches alone.
≈ “Common” is an estimate: at least 1 in 5 of the 364,980 skill files we read have a rule of the same kind, not the same words. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.
Files
Bring base branches up to date
A merged request leaves this machine's base branch behind its remote, and the
next worktree prepared from it starts stale. This skill closes that gap with a
fast-forward, and only a fast-forward. It is named ff rather than cc-ff
because people type it.
Moving a base branch changes the person's own working copy, so it happens only
on their word: invoking /ff, asking for it in words where the host has no
slash commands, or saying yes to the offer below. Never on your own.
/ff
| What the person typed | What you run |
/ff | repo sync, then workspace sync |
/ff api web | repo sync --id api --id web |
/ff workspace | workspace sync |
/ff api workspace | repo sync --id api, then workspace sync |
sh <root>/.context-circuit/cli --json repo sync
sh <root>/.context-circuit/cli --json workspace syncThe commands fetch, then move each base branch to its remote counterpart as a
fast-forward. They never switch a checked-out branch, merge, rebase, reset,
stash, or discard, and neither do you: do not pull, rebase, or run raw Git to get
past a status. Every status other than updated and current left that
repository's local branches and working files as they were (the fetch may have
refreshed remote-tracking refs), and its detail names what the person can do.
The workspace repository is held stricter than a code checkout. Any uncommitted
path in it, untracked included, reports dirty with the paths and fetches
nothing, while the code checkouts are still synced. Tell the person which paths
kept it back.
Reporting
One table, one row per repository: its ID, base branch, status, and either the
commits taken (from, to, commits) or why nothing moved. Say when something
was ahead — those are commits nobody has delivered yet.
When workspace sync moved the workspace it returns check_recommended: run
check and report what came in, including any finding the pull brought, which
is reported and does not block. When it also returns cli_version_changed, the
workspace now pins another CLI release and the launcher will refuse until it is
installed: say so, and point at .agents/skills/cc-cli/SKILL.md.
After a merge
When a person says their delivered work merged — "PR merged", "the MR is in", "sudah di-merge" — they have not asked for anything yet. Offer, in one reply, the two things that usually follow, and do neither until they answer.
- Work out which delivery merged: the
cc/<plan>/<repo>branches delivered in this conversation or named by the person, and the plans those branches carry. Where that is unclear, ask which request merged rather than guessing. - Offer to sync those repositories' base branches — not the workspace, which a merged code change does not move — and to mark those plans completed. Name the repositories with their base branch, and the plans by ID and title.
- One yes covers both. Run
repo sync --id …for those repositories, then complete the plans through.agents/skills/cc-complete/SKILL.md, which writes the note and reconciles the knowledge they changed. That yes is the explicit completion request; saying "merged" alone completes nothing. - A no, or a yes to only one of them, does only what was agreed.
Leave worktrees and cc/* branches alone. Removing them after a merge is a
separate request.
Does it work?
Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.
No reviews yet
People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.
- It worked
- Partly
- It didn't
Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.
Your trail
Files you open will collect here, so you can find them again.
Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.
Now do this for your own.
Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.

