Files

Defame1297 ed8c99efbd fix(git): stop prefixing rtk where it rewrites the output skills parse

The #113 sweep rested on CLAUDE.md's premise that rtk either filters or passes through unchanged,
so prefixing is always safe. Measured against rtk 0.42.4, that premise is false for several of the
commands the sweep prefixed, and two skills were left giving wrong answers silently.

Why:
- `rtk git worktree list --porcelain -z` discards both flags and renders its own format. The
`locked`/`lock_reason` fields git-worktrees Step 2 must emit are absent entirely, and paths under
$HOME are abbreviated to `~/`.
- `rtk git branch --list <name>` prints a phantom `* ` line even when nothing matches, so
git-branches' stated ambiguity test — "output from both means the name is ambiguous" — reported
every name as ambiguous. `tag --list` is a clean passthrough, so only one half broke.
- `rtk git diff --name-only`/`--name-status` append a `Changes:` trailer to output documented as
"one per line"; `--word-diff` emits none of the `[-removed-] {+added+}` markers its table
describes; `rtk git log -L` truncates each line at ~72 chars, on the one command whose purpose is
showing line content.
- `rtk git stash pop` prints only `FAILED: git stash pop`, swallowing the conflict diagnostic and
retained-entry message the surrounding prose tells the agent to rely on.

Implementation notes:
- Eleven sites reverted to bare `git`, each carrying its reason inline so the next sweep does not
undo it. `mergetool` and `rebase -i` are reverted on clause 3's interactive limb only: the TTY
defect does not reproduce — rtk filters exactly twelve subcommands and execs the rest — and
ADR-0023 records that measurement rather than a convenient one.
- ADR-0023 states the rule repo-wide with a third clause: a command whose output the skill parses,
or which is interactive, stays bare. `plugins/git/README.md` is reduced to a pointer; its claim
that gitea skills "contain no git/rtk mentions at all" was false, and its citation of
`hard-rules.md` pointed at a file containing no occurrence of "rtk".
- Eight gitea sites swept, all verified byte-identical passthroughs first.
- `scripts/check-rtk-prefix.sh` gates clause 1. Run against main's pre-sweep corpus it reports 99
findings including every gitea site, so it would have caught the drift #113 was filed about.

Impact: the gate covers clause 1 only, in shell-tagged fences and the opening span of Run cells.
Clause 2 is not gateable — "Run `git switch`" and "`git switch` refuses" are the same tokens — and
prose bullets are invisible to it. Both limits are recorded in gates.md rather than left implied.

Refs: #113
ADR: 0023
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01EeH8SCbcrCAQrtymkNuhKP

2026-09-09 05:14:54 +00:00

references

fix(git): stop prefixing rtk where it rewrites the output skills parse

2026-09-09 05:14:54 +00:00

README.md

refactor(skills): retrofit the corpus to the ADR-0020 context contract (#129 )

2026-09-01 13:47:46 +00:00

SKILL.md

fix(git): stop prefixing rtk where it rewrites the output skills parse

2026-09-09 05:14:54 +00:00

README.md

git-remotes

Manage git remote repositories — add/remove/configure remotes, push/pull with safety checks, fetch with pruning, and multi-remote workflows.

What it does

This skill handles remote operations within the git workflow suite. It manages remote configuration (add, remove, rename), fetch operations with pruning, push operations with force-push safety (--force-with-lease --force-if-includes), and pull strategies (fast-forward, rebase, merge). It returns structured results suitable for agent composition.

Usage

/git-remotes

Describe your remote operation: add a remote, push, pull, fetch, or configure tracking. The skill will handle the operation with appropriate safety checks and return results.

Files

File	Purpose
`SKILL.md`	Skill instructions for agents — force-push gate, dispatch table, return format
`references/README.md`	Describes the references directory contents
`references/remote-config.md`	Read when adding, removing, renaming, inspecting or re-pointing a remote, or configuring tracking, mirroring, or `set-url`
`references/fetch.md`	Read when fetching or pruning remote-tracking refs, or doing a shallow or partial fetch
`references/push.md`	Read when pushing branches or tags, writing refspecs, or force-pushing
`references/pull.md`	Read when integrating remote changes into the current branch, including the divergence rule
`references/sources.md`	Research sources and provenance

Composition

Callers that need submodule initialization after a --recurse-submodules pull hand off to git-submodules; local-only work (commits, branches, history) belongs to git-commits, git-branches, and git-history. The git-workflow skill routes humans here for any remote-touching request.