Task and run navigation inside Work>work; explain what a run and a merge are
This commit is contained in:
Sam
@@ -2294,3 +2294,94 @@ Committed as `7198c34`; the eight workspaces are rebuilt and running.
|
||||
- session: [[packs/paperclip-harness/80-sessions/rich-discovery-bin-2026-11-11-01-02-31|Rich discovery: bin 2026-11-11 01:02:31]]
|
||||
- context: [[packs/paperclip-harness/20-context/tmp|bin]]
|
||||
- observation: [[packs/paperclip-harness/60-observations/tmp-repository-structure-and-configuration-patterns|bin repository structure and configuration patterns]]
|
||||
|
||||
|
||||
---
|
||||
|
||||
## Update (2026-11-11 01:58:59)
|
||||
|
||||
## Structural/configuration observations (2026-11-11 01:58:59)
|
||||
|
||||
You caught three real problems. All three were mine, and all three are fixed.
|
||||
|
||||
## "You are auto merging" — that was the `m` key, and it was wrong
|
||||
|
||||
`m` used to merge immediately. Now it asks, and tells you exactly what it will do:
|
||||
|
||||
```
|
||||
╭─ merge AUD-171? ─────────────────────────────────────·focus· ╮
|
||||
│ 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 │
|
||||
```
|
||||
|
||||
Nothing merges until you press `y`. That is the approve step. The workflow is now: read the verdict in **review**, then `m` → read what will happen → `y`.
|
||||
|
||||
The two merges you saw (`AUD-168`, `AUD-171`) were me pressing `m` while testing, not an agent and not the interface deciding on its own.
|
||||
|
||||
## "Work>work does not have a list of runs"
|
||||
|
||||
It had one, but the pane was left sitting on the **merge** tab from my test, so you never saw it. Two changes:
|
||||
|
||||
- **runs is the default tab** when the pane opens, and it lists every run of the chosen task with a cursor;
|
||||
- pressing **`Enter` on a run opens a new `log` tab** with what Pi actually did — the wake payload, its reasoning, its tool calls.
|
||||
|
||||
The tab bar is now `runs · change · facts · review · log · merge`.
|
||||
|
||||
## Lazygit, and where it fits
|
||||
|
||||
Lazygit is not the merge gate. It is still one keystroke away (`t` → lazygit) for looking at branches, staging or history by hand. The gate is `bin/merge`: rebase, verify if the task has a command, `ocr` review, merge, re-check. Two different jobs — one is for you to poke at git, the other is the decision to put work on the main line.
|
||||
|
||||
## Shell now says where everything is
|
||||
|
||||
`Shell>shell` opens with a box, so you never have to remember a path:
|
||||
|
||||
```
|
||||
┌─ where things are ───────────────────────────────────────────────────┐
|
||||
│ project folder /tmp/pc-sandbox-2026-11-10 │
|
||||
│ task worktrees /tmp/pc-sandbox-2026-11-10/.paperclip/worktrees │
|
||||
│ this project's file /tmp/pc-sandbox-2026-11-10/.harness/harness.to… │
|
||||
│ harness commands /home/sam/paseo/projects/paperclip-harness/bin │
|
||||
│ pi conversations /home/sam/.pi/paperclips │
|
||||
│ pi skills you own /home/sam/.agents/skills │
|
||||
│ paperclip data /home/sam/.paperclip/instances/default │
|
||||
│ session paperclip-harness │
|
||||
│ watching AUD-171 │
|
||||
└──────────────────────────────────────────────────────────────────────┘
|
||||
```
|
||||
|
||||
Below it, four commands with one line each, for the things we deliberately do not wrap.
|
||||
|
||||
## Documentation updated
|
||||
|
||||
- `docs/TEST-PLAN.md` — step 4 now includes the confirmation, and a new step 4b covers picking a run and reading its log. Still no terminal commands anywhere.
|
||||
- `README.md` and `docs/WORKSPACES.md` — the new tabs, the `m` confirmation, the shell box.
|
||||
|
||||
Committed as `049e25a`. The eight workspaces are rebuilt; `Work>work` will open on runs with `AUD-171` chosen.
|
||||
|
||||
## Source paths observed
|
||||
|
||||
- `tmp/pc-sandbox-2026-11-10/.paperclip/worktrees`
|
||||
- `tmp/pc-sandbox-2026-11-10/.harness/harness.toml`
|
||||
- `home/sam/paseo/projects/paperclip-harness/bin`
|
||||
- `home/sam/.pi/paperclips`
|
||||
- `home/sam/.agents/skills`
|
||||
- `home/sam/.paperclip/instances/default`
|
||||
- `tmp/pc-sandbox-2026-11-10/.harness/harness.to`
|
||||
|
||||
## Evidence
|
||||
|
||||
- Confidence: 82%
|
||||
- Reason: Captured factual repo structure/configuration patterns from rich discovery
|
||||
|
||||
## Related learned memories <!-- same-turn-2026-11-11 01:58:59 -->
|
||||
|
||||
- context: [[packs/paperclip-harness/20-context/paperclip-harness|paperclip-harness TUI]]
|
||||
- decision: [[packs/paperclip-harness/50-decisions/paperclip-harness-ui-six-workspaces-spec-first-four-panel-li|Merge key requires explicit confirmation; lazygit is not the merge gate]]
|
||||
- action: [[packs/paperclip-harness/40-actions/2026-11-10-wrote-docs-ui-layout-md-and-three-live-layout-mockups|Fixed TUI merge confirmation, Work>work runs/log tabs, and shell path box; committed 049e25a]]
|
||||
- session: [[packs/paperclip-harness/80-sessions/rich-discovery-tmp-2026-11-11-01-58-59|Rich discovery: tmp 2026-11-11 01:58:59]]
|
||||
- context: [[packs/paperclip-harness/20-context/tmp|tmp]]
|
||||
- observation: [[packs/paperclip-harness/60-observations/tmp-repository-structure-and-configuration-patterns|tmp repository structure and configuration patterns]]
|
||||
|
||||
Reference in New Issue
Block a user