Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
`mise bootstrap --yes`.
- **App-owned config**: Apps that write their own config get a
`merge = "missing"` `[dotfiles]` entry instead of a symlink
(`codex/config.toml`, `antigravity/settings.json`,
(`codex/config.toml`, `antigravity/settings.json`, `pi/settings.json`,
`herdr/app/{settings,keys}.json`). The repo file seeds defaults: mise sets
only keys the live file lacks, at any depth, and the app owns every key after
that. A changed repo value does not reach a machine that already has the
Expand Down Expand Up @@ -86,6 +86,8 @@
`~/.local/share/gh/extensions/gh-stack` as a local extension.
Never run `gh extension install github/gh-stack`: gh keeps its copy and the
two writers fight.
- **slackcli**: never run `slackcli update`, even when the vendored skill
suggests it. It replaces the mise binary and leaves `mise.lock` stale.
- **Desktop apps** (`slack`, `zoom`, `yaak`): Pinned in `[vars]` in
`mise/conf.d/<app>.toml`, because mise cannot install an RPM. `obsidian` and
`soap-ui` are `http:` tools in `mise.toml` that read their releases through
Expand Down
19 changes: 19 additions & 0 deletions agents/.skill-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,25 @@
"skillFolderHash": "2be0d86d481d1bb29c62e11ef37b78d27d01b478",
"installedAt": "2026-08-07T06:39:33.103Z",
"updatedAt": "2026-11-06T10:12:01.442Z"
},
"slackcli": {
"source": "shaharia-lab/slackcli",
"sourceType": "github",
"sourceUrl": "https://github.com/shaharia-lab/slackcli.git",
"skillPath": "plugins/slackcli/skills/slackcli/SKILL.md",
"skillFolderHash": "0534fabf56e3cd50098a15000cbd49c912d2f995",
"installedAt": "2026-11-12T05:59:19.559Z",
"updatedAt": "2026-11-12T05:59:19.559Z"
},
"linear-cli": {
"source": "schpet/linear-cli",
"sourceType": "github",
"sourceUrl": "https://github.com/schpet/linear-cli.git",
"skillPath": "skills/linear-cli/SKILL.md",
"skillFolderHash": "729ad274482d0b1abbf6efcd913cb81c5661328a",
"pluginName": "linear-cli",
"installedAt": "2026-11-12T15:56:08.065Z",
"updatedAt": "2026-11-12T15:56:08.065Z"
}
},
"dismissed": {
Expand Down
22 changes: 17 additions & 5 deletions agents/AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ PDFs: `pdftotext` for text, `pdftoppm` + `tesseract` for OCR.

Web: `defuddle parse <url> --md --frontmatter -l en` first.
Interactive/auth: `agent-browser-odsod connect`, then `agent-browser open|read|click`.
Public URL for a local server (webhooks, external callers): `tailscale funnel --bg --https=8443 <port>`;
`tailscale funnel --https=8443 off` when done. Not cloudflared or ngrok.

`gh` always `-R <owner>/<repo>` (jj workspaces have no git remotes).
Owner/repo from `~/Code/<host>/<owner>/<repo>`,
Expand All @@ -50,9 +52,9 @@ Load `/agent-team` when asked to compose or run a multi-agent team.
is a symlink onto `.agents/skills`, never a second copy. Read and edit the
`.agents` path.

`~/.agents/skills/` holds only skills that apply in every repo: `herdr` and
`agent-team`. A skill about one repo belongs in that repo's own `.agents/skills/`.
Install a skill where it is needed rather than everywhere.
`~/.agents/skills/` holds only skills that apply in every repo: `herdr`,
`agent-team`, `slackcli`, and `linear-cli`. A skill about one repo belongs in
that repo's own `.agents/skills/`. Install a skill where it is needed rather than everywhere.

## Version control

Expand Down Expand Up @@ -81,6 +83,15 @@ for the languages, `jj <cmd> --help` for a command.
- `diff_lines()`, not `diff_contains()`. No `all:` modifier; use `visible_heads()`.
- Repos are colocated by default: `.jj/` and `.git/` both exist.

### PR boundaries

Each PR costs a CI runner reservation. Default to one PR; split commits, not PRs.

- New PR only at a ship gate: work that must merge and take effect first
(secrets to set, a migration to run, a release to pin). Name the gate in
that PR's body.
- Unrelated changes: use judgment, but bias to fewer PRs.

### PR lifecycle

1. `jj git fetch --remote origin`, then `jj rebase -o main@origin` if the stack
Expand All @@ -90,7 +101,7 @@ for the languages, `jj <cmd> --help` for a command.
Conflicts → `jj resolve -r <rev>`. Divergent → `jj converge --no-interactive`.
Empty description → `jj describe -r <rev> -m "<subject>"`.
3. Read each diff. Split mixed commits: `jj split -r <rev> <paths> -m "<subject>"`.
4. One bookmark per PR, bottom to top. Publish the chain as one GitHub stack:
4. One bookmark per ship gate, bottom to top. Publish several as one GitHub stack:

```
jj log --reversed -r 'trunk()..@ & bookmarks()' \
Expand All @@ -109,7 +120,8 @@ for the languages, `jj <cmd> --help` for a command.
5. Never run `gh stack init`, `add`, `submit`, `sync`, `rebase`, `view`, or
`modify`. They need an attached git HEAD, which a colocated jj repo never
has. `link`, `merge`, and `unstack` are safe.
6. Grow the stack with `jj bookmark create <new> -r @`,
6. No new gate: `jj bookmark set <top> -r @` and push. New gate: grow the
stack with `jj bookmark create <new> -r @`,
`jj git push --bookmark <new>`, `gh pr create`, then
`gh stack link <top-pr> <new-pr>`. Linking is additive.
7. Merge with `gh stack merge <pr> --yes --squash`. It merges that PR and every
Expand Down
Loading
Loading