Work>work: selectable runs, log pre-chosen, merge tab no longer shows another task's merge
This commit is contained in:
Sam
@@ -0,0 +1,53 @@
|
||||
---
|
||||
type: session
|
||||
id: session.paperclip-harness.paperclip-harness-runs-vs-merge-semantics-work-work-navigati
|
||||
title: Paperclip harness: runs vs merge semantics + Work>work navigation (AUD-171)
|
||||
status: active
|
||||
source_of_truth: false
|
||||
freshness: current
|
||||
last_reviewed: 2026-11-11
|
||||
tags:
|
||||
- pack/paperclip-harness
|
||||
- agent-memory/session
|
||||
- paperclip-harness
|
||||
- runs
|
||||
- merge
|
||||
- ocr
|
||||
- work-ui
|
||||
- navigation
|
||||
- bin/merge
|
||||
- AUD-171
|
||||
---
|
||||
|
||||
# Paperclip harness: runs vs merge semantics + Work>work navigation (AUD-171)
|
||||
|
||||
Discovery + implementation turn in /home/sam/paseo/projects/paperclip-harness (paperclip-harness pack).
|
||||
|
||||
Domain questions answered:
|
||||
- A 'run' = one execution of one agent on a task. Tasks can have several runs, each with its own log, triggered by: `assignment` (task given to agent), a comment, `automation` (Paperclip-started corrective run, e.g. previous run ended without setting a status), blockers resolved.
|
||||
- Measured run counts: AUD-167=1, AUD-164=2 (assignment then automation), AUD-166=2 (automation then assignment), AUD-169/AUD-168/AUD-171/AUD-165=1 (assignment). So Work>work showing a single run is truthful, not hiding runs.
|
||||
- 'Merge' is about code, not OCR. An agent works in the task's own worktree on its own branch; merge brings those commits onto `main`. `ocr` is the reviewer that reads the diff.
|
||||
|
||||
`bin/merge` order: (1) rebase task branch onto main; (2) run task's own verify command if present; (3) `ocr` reads diff — a critical finding refuses the merge; (4) merge branch into main; (5) re-check on main, roll back on failure. Merge is never automatic now: `m` prompts, showing source branch and base branch first.
|
||||
|
||||
UX fix for Board-then-Work being cumbersome: `Work>work` is now self-contained — header shows task position + run count (e.g. `Work · AUD-171 … task 1 of 13 read 13:16:47`; tab title `the work · 1 run`). Keys: `n`/`p` next/prev task, `o` pick from list, `↑`/`↓` choose run, `Enter` open run log, `m` merge after confirming. Choosing a task in Work writes the same choice the Board writes, so `Reply>reply` etc. follow. Board remains best for seeing everything at once.
|
||||
|
||||
Artifacts: new `docs/RUNS-AND-MERGE.md` (2932 bytes; includes measured run counts), README lists new keys. Commit `6aef6ce` — 'Task and run navigation inside Work>work; explain what a run and a merge are'. Validation: build=0 (build passing), 8 workspaces running with Work>work opening on runs for AUD-171.
|
||||
|
||||
## Evidence
|
||||
|
||||
- Confidence: 85%
|
||||
- Reason: Rich sanitized discovery snapshot with domain semantics, measured counts, CLI order, UX keys, artifacts, commit and validation.
|
||||
|
||||
## Related
|
||||
|
||||
- [[packs/paperclip-harness/00-system/pi-agent/memory-manifest|Memory Manifest]]
|
||||
|
||||
## 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]]
|
||||
@@ -0,0 +1,99 @@
|
||||
---
|
||||
type: session
|
||||
id: session.paperclip-harness.rich-discovery-home-2026-11-11-02-17-44
|
||||
title: Rich discovery: home 2026-11-11 02:17:44
|
||||
status: active
|
||||
source_of_truth: false
|
||||
freshness: current
|
||||
last_reviewed: 2026-11-11
|
||||
tags:
|
||||
- pack/paperclip-harness
|
||||
- agent-memory/session
|
||||
- autolearn
|
||||
- rich-discovery
|
||||
- repo/home
|
||||
---
|
||||
|
||||
# Rich discovery: home 2026-11-11 02:17:44
|
||||
|
||||
Sanitized rich discovery snapshot captured automatically from the completed turn.
|
||||
|
||||
|
||||
## Source paths observed
|
||||
|
||||
- `home/sam/paseo/projects/paperclip-harness/docs/RUNS-AND-MERGE.md`
|
||||
|
||||
## Final answer snapshot
|
||||
|
||||
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`.
|
||||
|
||||
## Evidence
|
||||
|
||||
- Confidence: 86%
|
||||
- Reason: Preserve full sanitized discovery detail from a rich investigation turn
|
||||
|
||||
## Related
|
||||
|
||||
- [[packs/paperclip-harness/00-system/pi-agent/memory-manifest|Memory Manifest]]
|
||||
|
||||
## 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]]
|
||||
Reference in New Issue
Block a user