This commit was merged in pull request #673.
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
|
||||
## Unreleased
|
||||
|
||||
- A project's config may set `epic-branch`, such as `epic-branch = "{epic}"`: do-epic then keeps one working branch per epic, level with the default branch by merge commits, and each chunk branches off it and merges into it without waiting for a person, even under `merge = "human"`. `chunk-pr open-epic` opens the finished epic's pull request into the default branch for a person to merge. `review-request-comment` names a comment `chunk-pr` posts after each push to ask a forge's reviewer for a review, and `jira-pull-request-open-status` and `jira-pull-request-merged-status` name the statuses do-epic moves an issue to as its pull request opens and merges.
|
||||
- `mutate-changes` mutates a Python script from its own folder where a test beside it imports it by its file name, as in `import run_harness`, so mutmut finds the tests' calls to it. A crash inside mutmut now becomes one report line that names mutmut's error, not a traceback, and the other folders still report.
|
||||
- do-epic starts an issue in Jira as its chunk starts: it assigns the issue to the account it works as, unless someone else holds it, and the new settings `jira-start-transition` and `jira-sprint-board` in its `config.toml` move the issue and add it to a board's active sprint.
|
||||
- Load no MCP server in the bench's headless `claude -p` judge and in the reviewer-merge trials' new-findings call either, so text an outsider wrote cannot reach one. A new check fails any Python file that passes `--tools` more often than `--strict-mcp-config`.
|
||||
|
||||
@@ -12,12 +12,11 @@
|
||||
|
||||
| ID | Release | Blocked by | Exempt | Item | L | E | I | R | S | Moves | Score |
|
||||
|---|---|---|---|---|---|---|---|---|---|---|---|
|
||||
| 472 | 0.15.0 | | owner | **Let a project's config name a working branch per epic, such as `TW-12345`, that chunks branch off, merge into and keep level with `main`, so a person merges the finished epic into `main` in one pull request.** | 4 | 2 | 3 | 7 | 7 | 1.5 by 6, 1.6 by 7 | 1.1 |
|
||||
| 479 | 0.15.0 | 472 | owner | **Record in a decision which of `CLAUDE.md`, path-scoped rules, agents, skills, hooks and plugins Claude Code loads from a `CLAUDE_CONFIG_DIR` home, whether a long-lived token logs in there, and where its transcripts and model catalogue land.** | 1 | 2 | 1 | 2 | 3 | 1.6 by 4 | 1.3 |
|
||||
| 479 | 0.15.0 | | owner | **Record in a decision which of `CLAUDE.md`, path-scoped rules, agents, skills, hooks and plugins Claude Code loads from a `CLAUDE_CONFIG_DIR` home, whether a long-lived token logs in there, and where its transcripts and model catalogue land.** | 1 | 2 | 1 | 2 | 3 | 1.6 by 4 | 1.3 |
|
||||
| 500 | 0.15.0 | | owner | **Mutate the Go lines a branch changes with Gremlins in `mutate-changes`, as it mutates Python, Rust, TypeScript and PHP, and print each mutant the tests do not kill.** | 2 | 2 | 2 | 4 | 4 | 1.1 by 4 | 1.2 |
|
||||
| 501 | 0.15.0 | 479, 500 | owner | **Ship `task-bench`, which plants a bug the tests catch at the places the comprehension seats found hardest, has Haiku fix it in a vanilla Claude Code at a base and a head, and prints for each side how often the fix passes, with its median tokens, turns, wall time and reads before it opens a file the bug is in.** | 4 | 2 | 1 | 5 | 9 | 1.1 by 5, code health by 4 | 0.6 |
|
||||
| 502 | 0.15.0 | 501 | owner | **Distil each `task-bench` run into a digest of short traces and decoys, the files most failing runs read but no fix touches, and have a stronger model turn it into plan items before the transcripts are deleted.** | 3 | 2 | 1 | 4 | 5 | 1.1 by 4, code health by 4 | 4.8 |
|
||||
| 469 | 0.15.0 | 472 | | **Move a do-epic parent issue whose sub-tasks a person filed to Release Ready once every sub-task has landed, and to Done once every sub-task is done, by transitions its config names.** | 3 | 2 | 2 | 5 | 4 | 1.2 by 4, 1.5 by 4, 1.6 by 3 | 3.1 |
|
||||
| 469 | 0.15.0 | | | **Move a do-epic parent issue whose sub-tasks a person filed to Release Ready once every sub-task has landed, and to Done once every sub-task is done, by transitions its config names.** | 3 | 2 | 2 | 5 | 4 | 1.2 by 4, 1.5 by 4, 1.6 by 3 | 3.1 |
|
||||
| 503 | 0.15.0 | 502 | owner | **Calibrate `task-bench` on fejkdata: bench a head against itself for the noise floor, then one finished chunk at its base and head, and record in a decision how many tasks and runs the bench needs.** | 1 | 2 | 1 | 2 | 2 | 1.1 by 3 | 1.2 |
|
||||
| 509 | 0.16.0 | 503 | owner | **Run `task-bench` beside the scoring run in larv-review comprehension check, and record its figures in the comprehension history beside the panel scores.** | 3 | 2 | 3 | 6 | 5 | code health by 5, 1.1 by 3 | 5.6 |
|
||||
| 504 | 0.16.0 | 503 | owner | **Bench new features in `task-bench`, each a spec for Haiku with acceptance tests it never sees and a reference patch that proves it can be built, kept in a `bench-tasks` folder the project config names, starting with six for fejkdata.** | 3 | 2 | 1 | 4 | 6 | 1.1 by 4, code health by 3 | 2.6 |
|
||||
@@ -109,36 +108,6 @@
|
||||
|
||||
## Details
|
||||
|
||||
### 472. Let a project's config name a working branch per epic, such as `TW-12345`, that chunks branch off, merge into and keep level with `main`, so a person merges the finished epic into `main` in one pull request.
|
||||
|
||||
Today every chunk branches off the default branch and its pull request merges into it. A team whose rules keep merges into `main` with a person, such as Timewave's, then sets `merge = "human"`, and the loop stops at every chunk until someone merges. lilleman asked on 2026-11-20 for a working branch per epic instead: agents merge each chunk into a branch named as the epic, such as `TW-12345`, and when the whole epic is done and reviewed, a person merges that branch into `main` in one pull request.
|
||||
|
||||
- **A setting in the project's config turns it on,** such as `merge-branch = "{epic}"`, filled with the epic's key. Left out, chunks branch off and merge into the default branch, as today. `project-config --help` and README's `### Set up a project` describe it.
|
||||
- **The first chunk of an epic creates the branch** off `origin/main` and pushes it. `chunk-preflight` branches each chunk's worktree off `origin/<epic branch>`, and `chunk-pr open`, `ready`, `merge` and `clean` take that branch as the base, not the default branch.
|
||||
- **`chunk-pr merge` merges into the epic branch without waiting for a person,** even under `merge = "human"`, which then governs only the epic branch's own pull request into `main`. lilleman's call: the team's rule against merging a pull request without a person's go-ahead covers `main` and protected branches, not an epic branch. Record this as a decision.
|
||||
- **Keep the epic branch level with `main`:** before each chunk starts, and before the final pull request opens, merge `origin/main` into the epic branch with a merge commit, never a rebase, since several chunks share it. A conflict stops the loop and asks the human; the loop never resolves one itself.
|
||||
- **CI and CodeRabbit run as on `main`:** the gate runs on every pushed branch in Timewave's repos already. CodeRabbit skips a pull request whose base isn't `main`, so `chunk-pr` comments `@coderabbitai review` after each push to such a pull request, and the chunk waits for that review as for any outside reviewer.
|
||||
- **Move each issue as the CI automations would:** `jira-code-review.yml` and `jira-release-ready.yml` fire only for pull requests into `main`, so on an epic branch do-epic makes those moves itself, by transitions its config names, such as Code Review when the pull request opens and Release Ready when it merges into the epic branch. Without them, do-epic would never see an issue land, and every issue it blocks would wait. Build on item 454's transitions.
|
||||
- **Test against the same epic branch in the other repos:** where a chunk's tests run other services, such as Timewave's integration harness, each sibling repo runs at its branch of the same name where one exists, and at `main` otherwise. The harness lives in the team's repo `docs-and-tools` (`docker/scripts/run_harness.py`), which today clones and runs every sibling at `main`; it needs a branch option there, through a Jira ticket of the team's, before the chunk can pass the epic branch to it. Until then, the chunk's summary says the siblings ran at `main`.
|
||||
- **When the epic's last issue is done,** run its release review on the epic branch, then open the pull request into `main` and leave it to a person.
|
||||
|
||||
Touches:
|
||||
|
||||
- `bin/chunk_pr/main.py`: `default_branch`, `opened`, `synced`, `levelled`, `marked_ready`, `merged`, `cleaned`
|
||||
- `bin/chunk_preflight/main.py`: `preflight`, `item_worktree`
|
||||
- `bin/git_cli/git_repo.py`: `default_branch` (small)
|
||||
- `bin/project_config/settings.py`
|
||||
- `bin/project_config/main.py`: `main` (small)
|
||||
- `bin/do_epic/config.py`: `DoEpicConfig`, `load`
|
||||
- `bin/do_epic/chunk_prompt.py`: `shipping`, `task`
|
||||
- `bin/do_epic/gates.py`: `gate`
|
||||
- `bin/do_epic/main.py`: `planned_and_started` (small)
|
||||
- `bin/do_epic/backend/jira.py`: `JiraEpic`
|
||||
- `bin/do_epic/test_do_epic.py`
|
||||
- `bin/chunk_pr/test_main.py`
|
||||
- `docs/decisions.md`
|
||||
- `README.md`: `### Set up a project` (small)
|
||||
|
||||
### 479. Record in a decision which of `CLAUDE.md`, path-scoped rules, agents, skills, hooks and plugins Claude Code loads from a `CLAUDE_CONFIG_DIR` home, whether a long-lived token logs in there, and where its transcripts and model catalogue land.
|
||||
|
||||
Part of the standalone-install plan lilleman approved on 2026-11-20. `do-release` and `do-epic` stand for the names item 478 picks. The plan runs every claude the loop starts in a Claude home of its own, so the human's `~/.claude` stays theirs. Find out by testing on a throwaway home, never the human's. The result decides whether the loop gets a home of its own, or loads the setup with `--plugin-dir`, `--settings` and `--append-system-prompt-file` instead.
|
||||
|
||||
Reference in New Issue
Block a user