agentws manages per-branch git worktrees for the unkin-agent user: it clones repos into the source root (~/src/prodenv/<repo>) so branches are visible in Ben's main checkout, and creates isolated worktrees under the worktree root (~/.cache/agentws/<repo>__<branch>). - New internal/agent/git.go: small, testable git helpers shelling out to the git binary (clone/fetch/worktree add/remove/list/prune, branch + config ops, porcelain parsing, path sanitizing). No go-git dependency. - New cmd/agentws: new / list / rm / clean / token / credential subcommands. Auth uses an ephemeral git credential helper (agentws credential get) so the ~1h Gitea token is never persisted in a remote URL or config; per-worktree config keeps the shared checkout's identity untouched. - Wire agentws into Makefile, scripts/build-rpm.sh, packaging/nfpm.yaml (binary + bash/zsh/fish completions), .woodpecker/release.yaml (cross-compile + assets) and .gitignore. - Tests: table tests for parsing/sanitizing/dir-naming, a real temp-git repo for the worktree lifecycle, and hermetic cmd tests (bad input + credential-helper host guard) that never touch the network. - Document agentws in README.md and AGENTS.md.
5.9 KiB
AGENTS.md
Project Overview
This repo ships several Gitea-automation CLIs in one RPM (agent-tools). They
act as the unkin-agent user by minting a scoped Gitea token from Vault, so
actions are attributed to the agent rather than to whoever runs the tool.
agentpr— create pull requests and post PR comments asunkin-agent(fixes the "tea posts as Ben" attribution problem). Subcommands:pr create,pr comment,whoami.watchpr— poll one or more PRs and exit when a tracked PR changes meaningfully: it merges/closes, gets a new non-agent comment, its CI fails, or it loses mergeability. Benign transitions (CI pending→success, the agent's own comments) are ignored.agentws— manage per-branch git worktrees forunkin-agent. Clones repos into the source root (~/src/prodenv/<repo>), creates worktrees under the worktree root (~/.cache/agentws/<repo>__<branch>), and authenticates clone/fetch/push via an ephemeral credential helper. Subcommands:new,list,rm,clean,token,credential.
All tools are separate main packages under cmd/ and share the
internal/agent package (Vault AppRole login, Gitea REST client, PR-ref
parsing, watch-state comparison, git worktree helpers).
Structure
cmd/agentpr/main.go # agentpr CLI (pr create / pr comment / whoami)
cmd/watchpr/main.go # watchpr CLI (poll + meaningful-change exit)
cmd/agentws/main.go # agentws CLI (new / list / rm / clean / token / credential)
internal/agent/ # shared plumbing:
token.go # env config + in-process Gitea-token cache
vault.go # AppRole login + read gitea/creds/unkin-agent
gitea.go # Gitea REST client (PR create/get, comments, status, whoami)
parse.go # owner/repo#N and owner/repo parsing
watch.go # PRState snapshot + MeaningfulChange comparison
git.go # git worktree/clone/fetch helpers (os/exec, no go-git)
go.mod # module git.unkin.net/unkin/agent-tools
Makefile # build / test / lint / completions / rpm / version-bump
packaging/nfpm.yaml # nfpm spec (envsubst-templated) for the RPM (all binaries)
scripts/build-rpm.sh # generates completions + packages the RPM with nfpm
.woodpecker/ # CI: build, test, pre-commit (PR) + release (tag)
dist/ # build output: binaries, completions, RPM (not committed)
Every binary is a separate main package, so make build builds each with its
own -o (a single go build ./... can't emit multiple mains to one file).
Token acquisition (shared)
All tools call agent.GiteaToken(), which (once per process):
- AppRole login:
POST $VAULT_ADDR/v1/auth/approle/loginwithrole_idonly (nosecret_id) →client_token. GET $VAULT_ADDR/v1/gitea/creds/unkin-agentwithX-Vault-Token→.data.token.
Config via env (all have defaults):
| Variable | Default | Purpose |
|---|---|---|
VAULT_ADDR |
https://vault.service.consul:8200 |
Vault/OpenBao address |
AGENT_APPROLE_ROLE_ID |
built-in default | AppRole role_id (overridable) |
GITEA_URL |
https://git.unkin.net |
Gitea base URL |
AGENT_LOGIN |
unkin-agent |
login whose comments watchpr ignores; agentws git identity |
AGENTWS_SRC_ROOT |
~/src/prodenv |
agentws source-of-truth checkout root |
AGENTWS_ROOT |
~/.cache/agentws |
agentws worktree root |
AGENTWS_OWNER |
unkin |
Gitea org that owns agentws-managed repos |
agentws git auth (ephemeral credential helper)
Gitea tokens are ~1h ephemeral, so agentws never bakes one into a remote URL
or config. agentws token prints a fresh token; agentws credential get
implements the git credential protocol (reads the key=value request on stdin,
and for the configured Gitea host only emits username=unkin-agent +
password=<fresh token>). agentws new wires this per worktree — it enables
extensions.worktreeConfig on the repo once, then writes user.name,
user.email and credential.helper = !<agentws> credential to the
per-worktree config so the shared checkout's identity/config is untouched.
Clone/fetch pass the same helper transiently via -c credential.helper=....
Worktrees are created FROM ~/src/prodenv/<repo> (git worktree add) so agent
branches are visible in Ben's main checkout; rm/clean fetch there afterwards
to keep the default branch current.
Build
make build # -> dist/agentpr, dist/watchpr, dist/agentws (CGO disabled, static)
Requires Go 1.21+. Dependency: github.com/spf13/cobra (CLI).
Packaging (RPM)
make rpm # build all binaries + package into dist/*.rpm via nfpm
scripts/build-rpm.sh generates bash/zsh/fish completions from the built
binaries and bundles them alongside /usr/bin/agentpr, /usr/bin/watchpr and
/usr/bin/agentws.
On a v* tag the release pipeline builds the RPM and PUTs it to the
artifactapi rpm-internal repo, then cuts a Gitea release.
Shell completions
Cobra provides a completion subcommand for each binary
(agentpr completion bash, etc.). The RPM installs them to the standard system
paths (/usr/share/bash-completion/completions/,
/usr/share/zsh/site-functions/, /usr/share/fish/vendor_completions.d/).
Testing
make test # go test -v -race ./...
internal/agent covers PR-ref parsing, the MeaningfulChange table (benign vs
alerting transitions), request-body construction, and the Vault+Gitea client
against httptest servers (fake AppRole login + gitea creds + PR create /
comment / whoami / status). No live Vault/Gitea access is required for tests.
Gotchas
watchprexits 0 with no output changes on--once(just prints state).- The token cache is process-wide (
sync.Once); tests call the unexportedfetchGiteaTokento avoid it. - CI "combined status" comes from
/commits/{sha}/status; an empty head SHA yields an empty state without an API call.