Skip to content

Commit 94f8ffd

Browse files
committed
Merge commit 'bb2081bd7685c84fb1bb600cbd938097e16159f3' into work/23-fix-ci-11-tests-fail-on-github
2 parents e0cc7a7 + bb2081b commit 94f8ffd

29 files changed

Lines changed: 615 additions & 79 deletions

‎README.md‎

Lines changed: 104 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,108 @@
1+
# herdr-projects 1.x, maintained copy
2+
3+
This is Robert's standalone, maintained copy of the legacy herdr-projects 1.x work board. It starts from
4+
[eliasstravik/herdr-projects v1.2.27](https://github.com/eliasstravik/shepherdr/releases/tag/v1.2.27), the last 1.x
5+
release, under the same MIT license with the original copyright kept ([LICENSE](LICENSE)). Upstream has moved on to
6+
[Shepherdr](https://github.com/eliasstravik/shepherdr). This copy carries the changes listed below, publishes no
7+
releases and is built from source. Problems go to
8+
[this repo's issues](https://github.com/jbutton/herdr-projects-legacy/issues).
9+
10+
After the next two sections, the page is upstream's README; only its install and update steps, and the links to them,
11+
were changed for this copy.
12+
13+
## What this copy adds
14+
15+
Merged here since v1.2.27, oldest first. The first eight came without a pull request, the rest through one each.
16+
17+
- A task's review covers only its own work: the range starts at the newer of main as merged in and the task's start, so
18+
a sync against a checkout that was behind no longer pulls old main history into it.
19+
([1101d71a](https://github.com/jbutton/herdr-projects-legacy/commit/1101d71a))
20+
- Two fixes to 1.2.27's own changes: an outside CI's passing check no longer hides another CI's failing check of the
21+
same name, and autopilot no longer takes a turn typed straight into the terminal for its own.
22+
([e33c42c3](https://github.com/jbutton/herdr-projects-legacy/commit/e33c42c3),
23+
[4e02936a](https://github.com/jbutton/herdr-projects-legacy/commit/4e02936a))
24+
- On macOS a process the board ended counts as ended (zombies were told only from `/proc`), and the clean-up names the
25+
folder a leftover process runs in. ([8381e6f2](https://github.com/jbutton/herdr-projects-legacy/commit/8381e6f2))
26+
- The check passes on macOS from a task's long temporary folder: each test's socket is in a short `/tmp/swt-…` folder,
27+
under macOS's 104-byte limit, and a flaky clock test stands still.
28+
([7d34070c](https://github.com/jbutton/herdr-projects-legacy/commit/7d34070c))
29+
- `stop` and the clean-up find a task's processes on macOS (from the system, where Linux reads `/proc`), and never end
30+
a run of the board's own program. ([2e599ea0](https://github.com/jbutton/herdr-projects-legacy/commit/2e599ea0))
31+
- `merge.syncRemote` (off by default): a task that lands in your checkout keeps up with that branch as origin has it,
32+
not with a checkout that may be behind, and your checkout is fast-forwarded to it before the work lands.
33+
([8313210d](https://github.com/jbutton/herdr-projects-legacy/commit/8313210d))
34+
- `merge.by none`, for a repo whose work lands through code review on GitHub: a task whose review passed waits as
35+
`Review passed: ready for code review`, and the board never merges it.
36+
([4b561cb5](https://github.com/jbutton/herdr-projects-legacy/commit/4b561cb5))
37+
- Every `gh` call names origin's repo, so in a fork's checkout with an `upstream` remote the board never reads
38+
upstream's pull request of the same number.
39+
([6e32aa4a](https://github.com/jbutton/herdr-projects-legacy/commit/6e32aa4a))
40+
- A task starts from origin's base branch fetched at that moment (the whole start held to 10 seconds), not from a copy
41+
up to a day old. ([#2](https://github.com/jbutton/herdr-projects-legacy/pull/2))
42+
- The push of a task's branch leases the exact commit origin has and never pushes over commits the task lacks, skips a
43+
head origin already has (so its pre-push hook does not run for nothing), and runs with the worktree's `mise` tools.
44+
([#4](https://github.com/jbutton/herdr-projects-legacy/pull/4))
45+
- Each GitHub check is judged by its newest run, so an older run that was cancelled or failed no longer fails or holds
46+
up a pull request. ([#7](https://github.com/jbutton/herdr-projects-legacy/pull/7))
47+
- A done task's clean worktree is removed also when it has submodules, nested ones included, and is looked at again
48+
right before it goes. ([#8](https://github.com/jbutton/herdr-projects-legacy/pull/8))
49+
- `archive.doneAfter` (off by default): a task done for that long archives itself; pinned tasks stay.
50+
([#9](https://github.com/jbutton/herdr-projects-legacy/pull/9))
51+
- A Codex reviewer starts with its hooks off and is never started signed out; a Codex on a provider of your own that
52+
needs no sign-in still reviews. ([#3](https://github.com/jbutton/herdr-projects-legacy/pull/3))
53+
- A Codex transcript is found in the day folder its id names, not by listing all of `~/.codex/sessions`.
54+
([#10](https://github.com/jbutton/herdr-projects-legacy/pull/10))
55+
- An agent that went away or exited mid-task is started again in its own conversation, three tries at most, before the
56+
task waits for you. ([#1](https://github.com/jbutton/herdr-projects-legacy/pull/1))
57+
- An MCP server that a helper such as `uv tool run` starts with its input on `/dev/null` counts as the agent's: it no
58+
longer keeps a done task's space in use, and `stop` leaves it running.
59+
([#12](https://github.com/jbutton/herdr-projects-legacy/pull/12))
60+
- A task that stops without a summary shows the agent's last words, not Claude Code's footer or its notices over the
61+
input box. ([#6](https://github.com/jbutton/herdr-projects-legacy/pull/6))
62+
- `review.prComment` (on by default): turned off, the review posts no comment on the pull request; it still runs and is
63+
judged at the gate. ([#13](https://github.com/jbutton/herdr-projects-legacy/pull/13))
64+
- A merge into your checkout (no pull request) is a fast-forward that git guards: a stray file no longer blocks it, an
65+
ignored file it would overwrite stops it, and a repo that signs its commits gets a signed merge commit.
66+
([#14](https://github.com/jbutton/herdr-projects-legacy/pull/14))
67+
- The keeper rereads a working task's transcript only when it changed, and then only the added bytes.
68+
([#11](https://github.com/jbutton/herdr-projects-legacy/pull/11))
69+
70+
## Install and update this copy
71+
72+
This repo publishes no releases: you build the program from source. Besides what upstream's install needs (macOS or
73+
Linux, Herdr 0.9.3 or newer, git, an agent CLI), that takes Rust ([rustup.rs](https://rustup.rs)).
74+
75+
```sh
76+
git clone https://github.com/jbutton/herdr-projects-legacy && cd herdr-projects-legacy
77+
cargo build --release # the program, in target/release/herdr-projects
78+
herdr plugin link "$PWD" # hooks, the board's tab and the actions
79+
sh bin/run.sh install # writes its launcher, says how to put it on your PATH
80+
```
81+
82+
Every command Herdr runs for the plugin goes through `bin/run.sh`, which runs `target/release/herdr-projects` while no
83+
source file is newer than it. Then open the board ([get started](docs/get-started.md)).
84+
85+
**Updating** is `git pull`, then `cargo build --release` again; an open board and the keeper load the new program by
86+
themselves. Build right after each pull: while the build is older than its source, `bin/run.sh` falls back to
87+
upstream's v1.2.27 program, downloaded, which has none of the changes above. `herdr-projects update` is no use here:
88+
it downloads upstream's releases, not this copy (this repo publishes none, and upstream's newest are Shepherdr's), and
89+
a program built from source refuses it anyway.
90+
91+
`herdr plugin install eliasstravik/herdr-projects` installs upstream, now Shepherdr. A `herdr plugin install` of this
92+
repo would get upstream's prebuilt 1.2.27 program in its build step instead of building this copy: use a checkout as
93+
above. [Installing](docs/install.md) has the details.
94+
95+
---
96+
197
<p align="center"><img src="https://img.shields.io/badge/Herdr%20Projects-Mission%20control%20for%20Herdr-2ea44f?style=flat-square&labelColor=24292f" alt="Herdr Projects | Mission control for Herdr" /></p>
298

399
<h3 align="center">Run dozens of coding agents through one Coordinator without micromanaging each one or losing sight of what needs you</h3>
4100

5101
<p align="center">Herdr Projects is mission control for <a href="https://herdr.dev">Herdr</a>: one list of tasks, yours and the ones you delegate. You type what needs doing and the board's own agent, the Coordinator, turns it into tasks. Every delegated task runs as an ordinary Herdr agent in its own space and worktree, gets checked and reviewed by a second agent when it finishes, and waits for your yes before it merges. The board shows which tasks need you, which are ready to approve and which are still working.</p>
6102

7-
<p align="center"><a href="https://github.com/eliasstravik/herdr-projects/blob/main/assets/herdr-projects-launch.mp4"><img src="assets/herdr-projects-launch.webp" width="88%" alt="Animation: you tell the Coordinator what you want, it adds tasks that each get an agent on their own branch, and the board groups them as needs you, ready to approve, and working" /></a></p>
103+
<p align="center"><a href="https://github.com/jbutton/herdr-projects-legacy/blob/main/assets/herdr-projects-launch.mp4"><img src="assets/herdr-projects-launch.webp" width="88%" alt="Animation: you tell the Coordinator what you want, it adds tasks that each get an agent on their own branch, and the board groups them as needs you, ready to approve, and working" /></a></p>
8104

9-
<p align="center"><a href="https://github.com/eliasstravik/herdr-projects/blob/main/docs/get-started.md"><img src="assets/buttons/install-herdr-projects.svg" alt="Install herdr-projects" /></a></p>
105+
<p align="center"><a href="https://github.com/jbutton/herdr-projects-legacy/blob/main/docs/get-started.md"><img src="assets/buttons/install-herdr-projects.svg" alt="Install herdr-projects" /></a></p>
10106

11107
<p align="center"><sub>✓&nbsp;Free,&nbsp;MIT&nbsp;licensed &nbsp; ✓&nbsp;Runs&nbsp;on&nbsp;your&nbsp;machines,&nbsp;no&nbsp;hosted&nbsp;service &nbsp; ✓&nbsp;macOS&nbsp;and&nbsp;Linux,&nbsp;Herdr&nbsp;0.9.3+</sub></p>
12108

@@ -50,7 +146,7 @@ An agent that asks you something, wants a permission or a sign-in says so to the
50146

51147
<table>
52148
<tr>
53-
<td align="center" valign="top" width="33%"><h3>1️⃣</h3><b>Install the plugin</b><br /><sub>Run <code>herdr plugin install eliasstravik/herdr-projects</code>. It downloads the one program for your platform: no Node, no npm.</sub></td>
149+
<td align="center" valign="top" width="33%"><h3>1️⃣</h3><b>Build and link the plugin</b><br /><sub>In a clone of this repo, run <code>cargo build --release</code> and <code>herdr plugin link "$PWD"</code> (<a href="#install-and-update-this-copy">install and update</a>). It is one program: no Node, no npm.</sub></td>
54150
<td align="center" valign="top" width="33%"><h3>2️⃣</h3><b>Open the board</b><br /><sub>Run the plugin's action "Open the work board", or <code>herdr plugin action invoke open --plugin herdr-projects</code> in a Herdr pane. Its first screen offers a key that opens it from anywhere in Herdr.</sub></td>
55151
<td align="center" valign="top" width="33%"><h3>3️⃣</h3><b>Type what needs doing</b><br /><sub>Press <code>Enter</code> and the Coordinator makes it a task, or <code>Tab</code> and each task gets an agent at once. <code>?</code> shows everything else you can do.</sub></td>
56152
</tr>
@@ -63,24 +159,23 @@ An agent that asks you something, wants a permission or a sign-in says so to the
63159
<td align="center" valign="top"><sub>For developers who run coding agents in Herdr on macOS or Linux</sub><br /><h2>Free</h2><div align="left">&nbsp;&nbsp;&nbsp;✓&nbsp; A Coordinator that turns what you type into tasks<br />&nbsp;&nbsp;&nbsp;✓&nbsp; Every task on its own worktree and branch, in its own Herdr space<br />&nbsp;&nbsp;&nbsp;✓&nbsp; A check and a second agent's review before anything merges<br />&nbsp;&nbsp;&nbsp;✓&nbsp; What needs you, on the board, in Herdr's sidebar and on your phone<br />&nbsp;&nbsp;&nbsp;✓&nbsp; Branches kept up to date with main, cleanup after a merge<br />&nbsp;&nbsp;&nbsp;✓&nbsp; Plans, attempts, limits, fallback agents and automations</div></td>
64160
</tr>
65161
<tr>
66-
<td align="center"><a href="https://github.com/eliasstravik/herdr-projects/blob/main/docs/get-started.md"><img src="assets/buttons/install-herdr-projects.svg" alt="Install herdr-projects" /></a></td>
162+
<td align="center"><a href="https://github.com/jbutton/herdr-projects-legacy/blob/main/docs/get-started.md"><img src="assets/buttons/install-herdr-projects.svg" alt="Install herdr-projects" /></a></td>
67163
</tr>
68164
</table>
69165

70166
## Updating
71167

72168
```bash
73-
herdr-projects update # put the newest release in place of the program
74-
herdr-projects update 1.2.0 # a given version
169+
git pull && cargo build --release # in your checkout of this repo
75170
```
76171

77-
An open board and the keeper see the new program and load it by themselves, once nothing is half typed and no agent is held up. Pulling a newer plugin with `git pull` does the same at the next command Herdr runs. A program you built yourself is updated with `git pull` and `cargo build --release`, never by a download. [Installing](docs/install.md) has the details.
172+
An open board and the keeper see the new program and load it by themselves, once nothing is half typed and no agent is held up. This copy publishes no releases, so `herdr-projects update` is no use here ([install and update this copy](#install-and-update-this-copy)). [Installing](docs/install.md) has the details.
78173

79174
## Get your questions answered
80175

81176
### Do I need to know how to code?
82177

83-
You need to be comfortable in a terminal. The plugin downloads one prebuilt program for your platform, and you never have to edit its files: everything changes by asking the Coordinator or from the board's settings page (`Ctrl+E`). You'll need macOS or Linux, Herdr 0.9.3 or newer, Git, `curl` or `wget`, and an agent CLI the board can start: Claude Code, Codex, pi or another agent herdr supports. `gh` (pull requests) and `tailscale` (private review links) are optional. Rust/Cargo is needed only when you build it yourself. [Installing](docs/install.md) covers the prerequisites.
178+
You need to be comfortable in a terminal. This copy is built once from source with one command, and you never have to edit its files: everything changes by asking the Coordinator or from the board's settings page (`Ctrl+E`). You'll need macOS or Linux, Herdr 0.9.3 or newer, Git, Rust/Cargo, and an agent CLI the board can start: Claude Code, Codex, pi or another agent herdr supports. `gh` (pull requests) and `tailscale` (private review links) are optional. [Installing](docs/install.md) covers the prerequisites.
84179

85180
### How do I check that Herdr Projects is running?
86181

@@ -128,6 +223,6 @@ Herdr Projects is free and [MIT licensed](LICENSE). Your agent CLI's usual usage
128223

129224
<p align="center">Your board starts with an install, one key, and one sentence about what needs doing. Herdr Projects starts the agents, checks their work and keeps it in view. You choose what to answer and what to merge.</p>
130225

131-
<p align="center"><a href="https://github.com/eliasstravik/herdr-projects/blob/main/docs/get-started.md"><img src="assets/buttons/install-herdr-projects.svg" alt="Install herdr-projects" /></a></p>
226+
<p align="center"><a href="https://github.com/jbutton/herdr-projects-legacy/blob/main/docs/get-started.md"><img src="assets/buttons/install-herdr-projects.svg" alt="Install herdr-projects" /></a></p>
132227

133228
<p align="center"><sub>✓&nbsp;Free,&nbsp;MIT&nbsp;licensed &nbsp; ✓&nbsp;Runs&nbsp;on&nbsp;your&nbsp;machines,&nbsp;no&nbsp;hosted&nbsp;service &nbsp; ✓&nbsp;macOS&nbsp;and&nbsp;Linux,&nbsp;Herdr&nbsp;0.9.3+</sub></p>

‎crates/core/src/store/settings/pilot_values.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use chrono::{Datelike, Local, TimeZone, Timelike};
88

99
fn refuse<T>(msg: String) -> Res<T> { Err(Error::refused(msg)) }
1010
/// The events, in the order they are kept and said.
11-
pub const EVENTS: [&str; 3] = ["done", "stuck", "added"];
11+
pub const EVENTS: [&str; 4] = ["done", "stuck", "stalled", "added"];
1212
pub const DAYS: [&str; 7] = ["mon", "tue", "wed", "thu", "fri", "sat", "sun"];
1313
/// Areas whose settings autopilot may never give a task.
1414
pub const NEVER: [&str; 3] = ["merge.", "limit.", "autopilot."];
@@ -22,8 +22,8 @@ pub fn check(e: &Entry, v: &Value) -> Res<Value> {
2222
match name {
2323
"autopilot.when" => {
2424
if w.len() == 1 && w[0] == "none" { return Ok(json!("none")); }
25-
if w.is_empty() { return refuse(format!("{name} is one or more of done, stuck, added, or none.")); }
26-
if let Some(bad) = w.iter().find(|x| !EVENTS.contains(&x.as_str())) { return refuse(format!("{name}: \"{bad}\" is not an event autopilot wakes on. One or more of: done, stuck, added; or none.")); }
25+
if w.is_empty() { return refuse(format!("{name} is one or more of done, stuck, stalled, added, or none.")); }
26+
if let Some(bad) = w.iter().find(|x| !EVENTS.contains(&x.as_str())) { return refuse(format!("{name}: \"{bad}\" is not an event autopilot wakes on. One or more of: done, stuck, stalled, added; or none.")); }
2727
Ok(json!(EVENTS.iter().filter(|x| w.iter().any(|y| y == *x)).copied().collect::<Vec<_>>().join(" ")))
2828
}
2929
"autopilot.hours" => {

0 commit comments

Comments
 (0)