Defame1297
6cfc3577e2
Finding 13: five blocks of near-identical wording were repeated across skills within a plugin — the gitea "resolve owner and repo" step (5 skills), the 404-masks-403 note (6 files), the manual pagination explanation (8 files), the git plugin's main/master force-push refusal (7 files, some with multiple internal restatements), and the bin skills' domain-glossary/ADR paragraph (5 skills). Tightened each instance in place — same meaning, fewer words — rather than extracting to a shared file, which ADR-0014's one-file-per-skill install constraint rules out. Left the three git skills' structured-result JSON shapes alone (coupled to the separate, out-of-scope git-orchestrate merge candidate, finding 19). Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01YR2CjVumUbEGWcMikcoXBD
4.3 KiB
4.3 KiB
name, description, metadata
| name | description | metadata | |||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| git-workflow | Use when a human's local git request is general or ambiguous — it routes to the owning domain skill: `git-commits`, `git-branches`, `git-history`, `git-remotes`, `git-submodules` or `git-worktrees`. An unambiguous request goes straight to its domain skill instead. Not an agent caller -> `git-orchestrate`. Not Gitea -> `gitea-workflow`. |
|
Gotchas
- Session context built during one multi-step request — branch names, the chosen base, the commit strategy — persists for that request and then clears. Do not re-ask the user for a decision they already gave you earlier in the same workflow.
- Run parent-repo commands through
rtk git <command>, never baregit <command>. This is a mandated org wrapper, not a style preference. Submodule-specific commands run from inside the submodule's own directory instead.
Domains
Route to the domain that owns the operation, and in sequence when a request spans two — a rebase
that ends in a force-push is git-commits, then git-remotes. An unambiguous request should have
gone straight to the domain skill; this one exists for the ones that did not.
| The request is about | Domain |
|---|---|
| Writing, amending, squashing, or cherry-picking a commit, and its message | git-commits |
Rebasing onto a new base, or undoing a commit with reset |
git-commits |
| Creating, switching, deleting, renaming, tracking, or merging a local branch | git-branches |
| Stashing work in progress to move between branches | git-branches |
| When a change landed, which commit broke something, what to revert or backport | git-history |
| Anything touching a remote — remote config, fetch, push, pull — even unnamed | git-remotes |
| A nested repository pinned inside this one by a recorded commit | git-submodules |
| Several branches checked out at once, in separate directories, without stashing | git-worktrees |
git-orchestrate executes whatever this resolves to (step 5); the table only decides which domain
owns the request.
Workflow
- Parse intent — extract the operation and, from the table above, the domain that owns it, plus any options the user named.
- Check the hard rules — if the request creates, amends, or rewrites a commit, pushes, or
touches hooks, config, or credentials, read
references/hard-rules.md. Raise the relevant rule before acting, not after. - Read the repo — current branch, working-tree state, and which branching model the repo
follows (
git-branchesinfers this from branch names: Gitflow ifdevelop/release/*exists, GitHub Flow otherwise); the last of those decides which tips are worth offering. - Gate destructive operations — before force-push, branch deletion, rebase, or
force-checkout, show what will happen and ask "Proceed?". Cancel gracefully if the user
declines. Never supply the confirmation on the user's behalf. Some operations are refusals, not
confirmations — never offer "Proceed?" for a force-push of
main/master. - Invoke the
git-orchestrateagent withoperation,parameters(user-provided or inferred),context(step 3 plus the session context), andconfirm: trueonly for a destructive op the user approved in step 4. - Clarify when the orchestrator asks for more — put its question to the user in plain language ("Which branch should this be based on?") and loop back to step 5 with the answer.
- Report the outcome — on success, the result and what changed, in plain language; on failure, the error reason and a recovery action.
Interaction style
The caller is a human, so the interaction is the point. Explain each step and why it happens ("I'm squashing your last 3 commits into one clean commit" beats "Squashing commits"), show progress as you go, and prefer natural language to raw command lines.
Match tips to the repo's branching model rather than offering generic advice: on a Gitflow repo,
feature branches come off develop and main tracks only released code; on a trunk-based or
GitHub Flow repo, short-lived branches off main keep merges small and reviewable.