Work>work: selectable runs, log pre-chosen, merge tab no longer shows another task's merge

.pi/memory-vault/packs/paperclip-harness/60-observations/tmp-repository-structure-and-configuration-patterns.md

@@ -2385,3 +2385,106 @@ Committed as `049e25a`. The eight workspaces are rebuilt; `Work>work` will open
 - 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]]
+
+
+---
+
+## Update (2026-11-11 02:17:44)
+
+`bin/merge` in /home/sam/paseo/projects/paperclip-harness is the code-merge path for task branches (not OCR). Stages, in order:
+1. Rebase the task's branch onto the base branch (`main`).
+2. Run the task's own verify command, if the task has one (if none: 'no verify command: the review decides').
+3. `ocr` reviews the change/diff — a critical finding refuses the merge.
+4. Merge the branch into `main`.
+5. Re-run checks on `main`; roll back on failure.
+
+Branch naming pattern observed: `AUD-<n>-<slug>` (e.g. `AUD-170-make-the-project-easier-to-start-fr…`, `AUD-171-another-status-file-status-2`).
+
+Run model: a task can have multiple runs (one execution of one agent), each with its own log. Wake reasons: `assignment`, comment, `automation` (corrective run auto-started by Paperclip, e.g. prior run ended without setting a status), blockers resolved. Typical tasks show 1 run; automation follow-ups produce 2.
+
+Caveat: the `m` merge prompt previously described merge in vague terms ('what happens … merge…'); it now surfaces the source branch and base branch explicitly.
+
+## Evidence
+
+- Confidence: 85%
+- Reason: Factual repo/component discoveries about merge pipeline and run model, with paths and caveats.
+
+
+---
+
+## Update (2026-11-11 02:17:44)
+
+## Structural/configuration observations (2026-11-11 02:17:44)
+
+Let me answer the three questions straight, because you were right that they were unclear.
+
+## What is a run?
+
+**One execution of one agent.** A task can have several, each with its own log, because
+Paperclip wakes an agent for different reasons:
+
+| what woke it | when |
+|---|---|
+| `assignment` | the task was given to an agent |
+| a comment | someone replied on the task |
+| `automation` | Paperclip started a corrective run, e.g. the previous run ended without setting a status |
+| blockers resolved | the task was waiting on another task and it finished |
+
+Measured here: `AUD-167` has **1** run, `AUD-164` has **2** (`assignment`, then `automation`), `AUD-166` has **2**. So the runs tab showing one run is not it hiding anything — those agents finished in a single run. A task with a slower or messier job will show several, and each opens to its own log.
+
+## What is merge, and is it OCR?
+
+No, merging is about **code**. An agent works in the task's own copy of the repository (a worktree) on its own branch. That branch holds commits that are not on the main line. Merging puts them there:
+
+```
+AUD-171-another-status-file-status-2   ──merge──▶   main
+```
+
+`ocr` is the reviewer that reads the change first. The order `bin/merge` follows:
+
+1. rebase the task's branch onto `main`;
+2. run the task's own verify command, if it has one;
+3. **`ocr` reads the diff** — a critical finding refuses the merge;
+4. merge the branch into `main`;
+5. re-check on `main`, and roll back if it fails.
+
+Merging never happens on its own now: `m` asks, and shows the branch and the base branch before anything runs.
+
+## The Board-then-Work flow — fixed
+
+That was cumbersome, and you should not have to do it. `Work>work` is now self-contained:
+
+```
+Work  ·  AUD-171  Another STATUS file…   task 1 of 13            read 13:16:47
+╭─ the work · 1 run   runs   change   facts   review   log   merge ──·focus·╮
+```
+
+- **`n` / `p`** — next / previous task, with `task 3 of 13` in the header. You never leave the pane.
+- **`o`** — pick a task from a list.
+- **`↑` / `↓`** — choose a run; the tab title says how many there are (`1 run`).
+- **`Enter`** — open that run's log.
+- **`m`** — merge, after asking.
+
+Choosing a task here writes the same choice the Board writes, so `Reply>reply` and the rest follow. The Board is still the best place to see everything at once; it is no longer the only way to move.
+
+## Written down
+
+`docs/RUNS-AND-MERGE.md` holds all of this, including the measured run counts, and the README lists the new keys. Committed as `6aef6ce`. The eight workspaces are running, with `Work>work` opening on runs for `AUD-171`.
+
+## Source paths observed
+
+- `home/sam/paseo/projects/paperclip-harness/docs/RUNS-AND-MERGE.md`
+
+## Evidence
+
+- Confidence: 82%
+- Reason: Captured factual repo structure/configuration patterns from rich discovery
+
+## Related learned memories <!-- same-turn-2026-11-11 02:17:44 -->
+
+- action: [[packs/paperclip-harness/40-actions/2026-11-10-wrote-docs-ui-layout-md-and-three-live-layout-mockups|Made Work>work self-contained; documented runs + merge (commit 6aef6ce)]]
+- session: [[packs/paperclip-harness/80-sessions/paperclip-harness-runs-vs-merge-semantics-work-work-navigati|Paperclip harness: runs vs merge semantics + Work>work navigation (AUD-171)]]
+- observation: [[packs/paperclip-harness/60-observations/tmp-repository-structure-and-configuration-patterns|paperclip-harness: task run model and bin/merge pipeline specifics]]
+- runbook: [[packs/paperclip-harness/70-runbooks/tmp-deployment-operations|navigate tasks and runs inside Work>work and merge safely (paperclip-harness)]]
+- session: [[packs/paperclip-harness/80-sessions/rich-discovery-home-2026-11-11-02-17-44|Rich discovery: home 2026-11-11 02:17:44]]
+- context: [[packs/paperclip-harness/20-context/home|home]]