This commit was merged in pull request #639.
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
|
||||
## Unreleased
|
||||
|
||||
- Add the project setting `merge = "human"`, for a team that merges its own pull requests: `chunk-pr merge` then marks the pull request ready and leaves the merge to a person, and a do-epic chunk parks, shown as `awaits your merge`, until the pull request is merged.
|
||||
- do-epic reads a team's own repo labels: a `[label-repos]` table in `~/.claude-projects/do-epic/config.toml` maps each such label to its repo, such as `twu-4 = "tenant-web-ui-4"`, and do-epic reads a mapped label as it reads `repo:<name>`. An issue a person filed a sub-task under is no longer split by repo: its sub-tasks run instead, each under a label of its own, and the team closes the issue.
|
||||
- do-epic --file takes --blocked-by <KEY> and --parent <KEY>, so a chunk files the next pull request of a change as an issue that waits for the one before it; a chunk's first prompt says when to use them.
|
||||
|
||||
|
||||
@@ -14,10 +14,9 @@
|
||||
|---|---|---|---|---|---|---|---|---|---|---|---|
|
||||
| 452 | 0.13.0 | | | **Make do-epic's view of the Jira workflow settings: the statuses at which an issue unblocks the issues it blocks, and the moves the team's own automation makes, so do-epic makes none of those.** | 3 | 2 | 2 | 5 | 5 | 1.6 by 7, 1.5 by 3 | 2.1 |
|
||||
| 449 | 0.13.0 | | | **Record do-epic's repo picks and sub-task summaries in the team's own spelling, such as `core-4` and `core-4: Bygg …`, as its config sets them.** | 2 | 2 | 2 | 4 | 3 | 1.6 by 6 | 2.0 |
|
||||
| 451 | 0.13.0 | | | **Add a project setting `merge = "human"`, under which a chunk leaves its pull request ready for a person to merge, and a do-epic chunk parks until the pull request is merged.** | 3 | 2 | 3 | 6 | 5 | 1.6 by 7 | 1.4 |
|
||||
| 458 | 0.13.0 | 451 | | **Resume a chunk whose pull request awaits a person's merge once it no longer merges cleanly into the default branch, so the worker brings it level again.** | 3 | 2 | 2 | 5 | 4 | 1.6 by 4, 1.5 by 3 | 1.9 |
|
||||
| 458 | 0.13.0 | | | **Resume a chunk whose pull request awaits a person's merge once it no longer merges cleanly into the default branch, so the worker brings it level again.** | 3 | 2 | 2 | 5 | 4 | 1.6 by 4, 1.5 by 3 | 1.9 |
|
||||
| 453 | 0.13.0 | | | **Make the issue types that do-epic and `todo-item add` file in Jira settings, since a Jira project such as TW has no Task type.** | 2 | 2 | 1 | 3 | 2 | 1.6 by 5 | 1.8 |
|
||||
| 457 | 0.13.0 | 451 | | **Keep loop-claude from starting a chunk for an item whose pull request is ready and awaits a person's merge under `merge = "human"`.** | 3 | 2 | 2 | 5 | 5 | 1.6 by 5, 1.4 by 3 | 1.7 |
|
||||
| 457 | 0.13.0 | | | **Keep loop-claude from starting a chunk for an item whose pull request is ready and awaits a person's merge under `merge = "human"`.** | 3 | 2 | 2 | 5 | 5 | 1.6 by 5, 1.4 by 3 | 1.7 |
|
||||
| 450 | 0.13.0 | | | **Add `do-epic <EPIC-KEY> --dry-run`, which prints every Jira write planning would make and each chunk that would start, and makes none of them.** | 2 | 2 | 2 | 4 | 3 | 1.6 by 5 | 1.6 |
|
||||
| 454 | 0.13.0 | | | **Start a do-epic chunk's issue as the team's board expects, by settings: assigned to the account do-epic works as, moved by a start transition and added to a board's active sprint.** | 3 | 2 | 2 | 5 | 4 | 1.6 by 4 | 1.1 |
|
||||
| 446 | 0.14.0 | | question | **Kill the process a stuck check names where its verdict is `stuck`, once the human says the recorded verdicts match what they would have done.** | 2 | 2 | 3 | 5 | 3 | 1.5 by 3 | 1.0 |
|
||||
@@ -119,28 +118,6 @@ Touches:
|
||||
- `bin/do_epic/test_split.py`
|
||||
- `README.md`: `### Set up a project` (small)
|
||||
|
||||
### 451. Add a project setting `merge = "human"`, under which a chunk leaves its pull request ready for a person to merge, and a do-epic chunk parks until the pull request is merged.
|
||||
|
||||
Every chunk merges its own pull request with `chunk-pr merge`. Some teams forbid that: Timewave's conventions say never to merge a pull request without the human's explicit go-ahead for that pull request. The loop can't run in such a team's repos without breaking the rule, and `wait-for-approval` doesn't cover it, since a reviewer's approval is not the go-ahead to merge.
|
||||
|
||||
- A project setting `merge` takes `chunk`, the default and today's behaviour, or `human`.
|
||||
- Under `human`, `chunk-pr merge` levels the branch and marks the pull request ready, then leaves the merge to a person and exits saying the pull request awaits a person's merge.
|
||||
- A do-epic chunk then parks on a new gate, `your merge`, shown in its window's name and in `--status` like any gate. It takes no slot, finishes once the forge reports the pull request merged, and still resumes when a reviewer comments.
|
||||
- A loop-claude chunk ends with the pull request ready. The chunk settles how the item's `--finish` runs after a person merges it.
|
||||
- `parked_through` in `bin/do_epic/main.py` is the place the comprehension seats found hardest to follow; leave it easier to read than it was.
|
||||
|
||||
Touches:
|
||||
|
||||
- `bin/project_config/settings.py`: `SCALARS` (small)
|
||||
- `bin/chunk_pr/main.py`: `merged`, `merge_turn`
|
||||
- `bin/chunk_pr/approval.py`: `awaited` (small)
|
||||
- `bin/do_epic/gates.py`: `gate`, `Gate`
|
||||
- `bin/do_epic/main.py`: `parked_through`
|
||||
- `bin/do_epic/chunk_prompt.py`: `shipping`
|
||||
- `bin/do_epic/test_gates.py`
|
||||
- `bin/do_epic/test_main.py`
|
||||
- `README.md`: `### Set up a project` (small), `## Tools` (small)
|
||||
|
||||
### 458. Resume a chunk whose pull request awaits a person's merge once it no longer merges cleanly into the default branch, so the worker brings it level again.
|
||||
|
||||
Under `merge = "human"` a pull request stays ready for hours or days while the default branch moves. A conflict, such as each branch holding its own changelog bullet or plan edit, or a branch protection that requires an up-to-date branch, then blocks the person who would merge it. Yet `gate` in `bin/do_epic/gates.py` reads only the draft state, the checks, the review decision and the waiting threads, so the window and `--status` keep saying `awaits your merge`, and nothing resumes the chunk unless a reviewer comments.
|
||||
|
||||
Reference in New Issue
Block a user