Merge asks first; Work>work lists runs with a log tab; Shell says where everything is

This commit is contained in:
Sam
2026-11-11 12:58:37 +11:00
parent 7198c34e42
commit 049e25af70
14 changed files with 697 additions and 22 deletions

View File

@@ -88,7 +88,21 @@ Go to `Work>work`. It follows the task you chose on the board.
No terminal. Stay in `Work>work`.
1. Press `m`. The **merge** tab opens by itself and shows what is happening:
1. Press `m`. It **asks first**, and tells you what it is about to do:
```
merge AUD-1xx?
what happens rebase onto the base branch
no verify command: the review decides
ocr reviews the change; a critical finding refuses the merge
merge, then re-run the checks on the base branch
y do it
esc or n do nothing
```
That is the approval step. Nothing merges until you press `y`.
2. Press `y`. The **merge** tab shows what is happening:
```
merge of AUD-1xx started 12:01:39
@@ -99,7 +113,7 @@ No terminal. Stay in `Work>work`.
merge finished 12:01:43
```
2. Wait for `merged into main at <commit>`. That commit is the task's work, on the project's
3. Wait for `merged into main at <commit>`. That commit is the task's work, on the project's
base branch.
**Expected:** a green refusal line, not a red one. If it says `refused: the review found 1
@@ -108,7 +122,13 @@ blocking item(s)`, the gate worked — the findings are on the task and in `Work
**Starting a merge twice by accident is safe**: the merge takes a lock and the second one is
refused with `another merge is in progress`.
## Step 4b — choose a task without leaving Work
## Step 4b — look at one run, without leaving Work
In `Work>work` the **runs** tab lists every run of the chosen task. `↑`/`↓` to one and press
`Enter`: the **log** tab opens with what Pi actually did — the wake payload, its reasoning, its
tool calls. `[` goes back.
## Step 4c — choose a task without leaving Work
In `Work>work`, press `o`. A list of this project's tasks appears. `↑`/`↓` to one, `Enter`, and
the runs, change, facts, review and merge tabs all switch to it. You never have to go to