pi-cohort 7.0.0 → 7.0.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [7.0.2] - 2026-09-20
+
+### Changed
+
+- `/investigate` runs the verification wave right after the wave-1 draft instead of asking "Run the verification tasks?": every wave is read-only, so the request already authorizes the whole run. The brief prints once, with `### Verified` filled in.
+
+## [7.0.1] - 2026-09-17
+
+### Fixed
+
+- `/handoff` records the run's linked worktree instead of the session cwd: the producer names it, the scout validates it against `git worktree list --porcelain` and snapshots it via `git -C`; a rejected candidate is surfaced under `## Open questions`; the `worktree:` field no longer misreports `yes` from a primary subdirectory. ([#17](https://github.com/jjuraszek/pi-cohort/issues/17))
+
 ## [7.0.0] - 2026-09-17
 
 ### Removed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-cohort",
-  "version": "7.0.0",
+  "version": "7.0.2",
   "description": "Delegate Pi work to focused child agents: code review, scouting, implementation, parallel audits, saved chains, and background jobs.",
   "author": "Jacek Juraszek",
   "license": "MIT",

package/prompts/handoff.md

@@ -15,12 +15,23 @@ $@
 - You write `## Intent`, `## Decisions`, `## Open questions`, and `## Skills loaded` from your own transcript, before the call and after it returns. Do not fork a child for this: forking a near-full transcript is the cost this handoff avoids.
 - Write nothing into the repository; the brief goes to `--out` or `$DIR/handoff.md`.
 
+## Run worktree
+
+Before the snapshot dispatch, determine the run worktree from your own transcript and interpolate it into the scout task as `Run worktree: <abs path>` or `Run worktree: none`:
+
+- A flow-level worktree the run created (any `git worktree add <path>` you ran, or a `Worktree ready at <path>` report from `/skill:using-git-worktrees`) or was told to work in (a resume brief's `worktree: yes <path>`, or a user instruction).
+- Never inferred from the session cwd; a created or assigned worktree still qualifies when it happens to equal the cwd. Never a per-task worktree from `tasks[].worktree: true` or `worktree: true` dispatches - those are ephemeral.
+- Two flow-level worktrees in the transcript: the candidate is the one most recently used by later work (a dispatch `cwd`, a `git -C <path>`, or a `cd <path>`); if that does not distinguish them, the most recent creation or assignment. The other goes into `## Open questions` as `Also seen: <path> - not recorded as the run worktree`.
+- No flow-level worktree created or named: `Run worktree: none`.
+
+After the scout returns, copy any `open-question:` line from `repo.md` into `## Open questions` without the `open-question:` prefix; it never appears in `## Repo state`.
+
 ## Repo snapshot
 
 ```
 subagent({ async: false, context: "fresh", tasks: [
   { agent: "scout", cwd: "<cwd>", reads: false, output: "<DIR>/repo.md",
-    task: "Read-only; write only to your output path. Report each field on its own line, `unavailable` when a command fails: toplevel (git rev-parse --show-toplevel); `worktree: yes <path>` when git rev-parse --git-dir and --git-common-dir differ, else `worktree: no`; branch (git branch --show-current, `detached` when empty); HEAD SHA; base (origin/HEAD short name, else origin/main or origin/master if present, else `base: unknown`); dirty (git status --porcelain, or `clean`); diff-stat (git diff --stat <base>...HEAD; `diff-stat: unavailable` when base is unknown); test command (package.json scripts or AGENTS.md). Not a git repo -> the single line `not a git repo`." }
+    task: "Read-only; write only to your output path. Run worktree: <abs path|none>. Steps: (1) linked set: git worktree list --porcelain | awk '/^worktree /{print substr($0,10)}' - the first line is the primary checkout, the rest are the linked worktrees; a relative candidate resolves against the primary toplevel, not cwd. (2) candidate `none` or line absent -> target is cwd, go to (4). Otherwise if the candidate is relative, prefix it with the primary toplevel (first linked-set line) first; C=$(git -C <candidate> rev-parse --show-toplevel); valid when that succeeds and C equals one of the linked lines exactly (a line after the first; equality with the first, primary line is invalid); anything else (failure, not listed, the primary itself, prunable) is invalid -> target is cwd and emit the open-question line in (5). (3) valid -> target is $C and `worktree: yes $C`. (4) target cwd -> T=$(git rev-parse --show-toplevel); `worktree: yes $T` when $T equals one of the linked lines exactly (a line after the first; the first, primary line gives `worktree: no`), else `worktree: no`. (5) report each field on its own line, `unavailable` when a command fails, every git command as `git -C <target>`: toplevel (git -C <target> rev-parse --show-toplevel); the worktree line from (3) or (4); branch (git -C <target> branch --show-current, `detached` when empty); HEAD SHA; base (origin/HEAD short name, else origin/main or origin/master if present, else `base: unknown`); dirty (git -C <target> status --porcelain, or `clean`); diff-stat (git -C <target> diff --stat <base>...HEAD; `diff-stat: unavailable` when base is unknown); test command (<target>/package.json scripts or <target>/AGENTS.md). Invalid candidate: after the fields add the single line `open-question: producer named <candidate as submitted> as the run worktree; it is not a linked worktree of this repo`. cwd not a git repo -> the single line `not a git repo`, plus the same open-question line if a candidate was submitted." }
 ]})
 ```
 

package/prompts/investigate.md

@@ -17,6 +17,7 @@ $@
 - Write nothing into the repository. The brief goes to `--out` if given (relative resolves against cwd), else `$DIR/brief.md`.
 - A question whose answer is in code, docs, or the tracker is not asked; it is looked up in wave 1 or wave 2.
 - A verification task that would run, build, or validate the proposed change is rejected at brief-writing time. Wave 2 exercises the system as it is today.
+- No human gate between waves: the request is the approval for the whole investigation, and every wave is read-only.
 
 ## Wave 1
 
@@ -40,12 +41,12 @@ A task that errored or left its output empty -> its section reads `<agent> faile
 
 ## Brief
 
-Read the outputs and write, section names fixed:
+Read the outputs and draft, section names fixed:
 
 ```markdown
 # Investigation: <slug>
 ## Request
-## Findings            (cited; `### Verified` appended after wave 2)
+## Findings            (cited; `### Verified` holds wave 2 results)
 ## External context    (only when context-builder ran; unreadable refs listed)
 ## Premise check       (Confirmed / Contradicted / Unverified - one line each, cited)
 ## Open questions      (numbered; each ends with `Recommendation: <answer> - <why>`)
@@ -53,8 +54,6 @@ Read the outputs and write, section names fixed:
 ## Next steps          (suggestions only; no implementation task decomposition)
 ```
 
-Print the path and the brief.
+## Wave 2
 
-## Wave 2 (ask once)
-
-Ask: "Run the verification tasks?" No -> stop. Yes -> one call `subagent({ async: false, context: "fresh", tasks })`, one task per verification task, `scout` by default or `reviewer` when judgement is needed, each task text containing the phrase "read-only", `reads: false`, absolute `output` under `$DIR`. Fold results into `## Findings` under `### Verified` and rewrite the brief at the same path.
+Runs immediately after the draft; no ask. One call `subagent({ async: false, context: "fresh", tasks })`, one task per verification task, `scout` by default or `reviewer` when judgement is needed, each task text containing the phrase "read-only", `reads: false`, absolute `output` under `$DIR`. No verification tasks -> skip the wave and omit `### Verified`. Fold results into `## Findings` under `### Verified`, write the brief, and print the path and the brief once.