Allow friendly teasing and worker pushback in supervision

Co-Authored-By: Pi/Astra <288921227+claudypoo@users.noreply.github.com>

.gitignore

@@ -1,6 +1,6 @@
 node_modules/
 dist/
-*.log
+.local/
 .pi/
-docs/reviews/raw.jsonl
-docs/reviews/err.txt
+slop/
+*.log

AGENTS.md

@@ -1,24 +1,35 @@
 # pi-goals contributor notes
 
+## Design
+
+The main chat discusses the plan with the user, then supervises an interactive `goals-worker` in Herdr. Use stock pi-subagents, pi-intercom and pi-schedule-prompt; do not build another transport, scheduler or worker runtime.
+
+> the hope is we can have a smart supervisor like you, with judgment and context. But it doesn't use many tokens as it checks in and sees an overview.
+>
+> It steers a smaller model, adding perspective and judgment.
+>
+> Well, I want to see what the supervisor is thinking and saying. That's the whole point: all supervisor thinking and messages should be visible.
+
+— wassname
+
+- Keep supervisor inspection tools. It inspects actual results, delegates implementation and must not weaken the user's goal to accept worker output.
+- Put all model-facing prompts in `src/prompts.ts`, in conversation order. Preserve the user's verbatim requirements.
+- `/goals` opens actions. New plan starts a discussion without an objective form. Unknown commands never start planning. A changed settled draft opens the approval dialogue; unchanged discussion does not repeatedly reopen it.
+- Keep goal titles/status in widgets; omit subtask text. Tasks and evidence remain in the plan.
+- Keep startup/compaction plan context, short upkeep reminders and visible editable hourly check-ins. Avoid unchanged-plan repetition and identity-only review turns.
+- Keep recoverable solo mode: confirm other writers stopped before taking over. Solo completion is self-verification.
+- Record distinct runtime ID, Intercom ID and saved-session path with provenance. A handle or delivery receipt is not proof of liveness or action. User model changes are authorized; do not silently restore an old preference.
+
 ## Tests
 
-Run `npm test` before a commit. It includes unit and flow tests plus the RPC review test.
+Run `npm test`, `npm run typecheck` and `npm run lint` before committing.
 
-- `test/*.test.ts` unit and flow tests use a small Pi API mock. They check plan state, tool gates, and plan-file updates.
-- `npm run test:rpc` runs `test/rpc-review.test.ts`. It starts the installed Pi executable in RPC mode, uses Pi's real `select` and `editor` protocol, and uses a local deterministic HTTP model. It does not need a credential or spend API credits. This is the closest automated session test.
-- Use tmux for visual TUI debugging when the RPC test fails or a terminal-only problem is reported:
+`test/goals.test.ts` exercises current state, file updates and role restrictions with a Pi API mock. `test/rpc-review.test.ts` starts real Pi with a deterministic local model and schema-only worker tools: it checks automatic proposal, editor/discussion and Ready role transition without credits or launching workers. It does not prove Herdr rendering, live message delivery or model judgment.
 
-  ```bash
-  tmux new-session -s pi-goals-debug 'cd /path/to/pi-goals && pi -e ./src/index.ts'
-  ```
+For functional acceptance, read `herdr --skill`, confirm `HERDR_ENV=1`, and use `scripts/prepare-trial.mjs` to create an isolated project/profile. Open only new no-focus test panes. Observe the actual planning dialogue and Ready selection, worker attachment, Intercom report, independent artifact inspection and CompleteGoal. Record interventions separately from autonomous success. Preserve nonempty byte/test evidence. Never reload or operate active user research panes. Close test panes when finished.
 
-  Run `/goals <objective>` in that pane. Tmux checks the rendered menu, editor focus, widget, and keyboard handling. RPC does not render the terminal UI.
-- `pi -p` has no UI, so it cannot test `Ready`, `Refine`, `Edit`, or `Cancel`.
+Known stock limits: stop workers before supervisor reload (later worker exit can crash its stale context); disabled scheduler jobs are deleted on reload/shutdown. Test saved-session/solo recovery without repeating completed work; do not claim these package bugs are fixed here.
 
-## Intended supervision workflow
+Keep temporary plans, audits and captures under ignored `.local/`. Git history retains the removed historical material. Do not add root handovers or duplicate READMEs. Never touch human-named files or credentials.
 
-I already have pi-intercom-supervisor, but thought using pi-subagents could make it simpler. The idea is that the user makes a plan as in pi-goals, but on this branch, instead of a naive stateless subagent, we 1) fork, 2) compact, and 3) make it a supervisor with a prompt as in pi-intercom-supervisor. The supervisor is cheap because it sees only high-level material, which costs fewer tokens. It has good judgement because it sees a) compacted planning context, b) the plan, and c) summarised context (for example, my modified pi-vcc). This lets it operate read-only and steer the worker without losing track. It also compacts every 100k tokens to keep it cheap and high-level.
-
-I am now thinking the subagent implementation may be too difficult. To keep the plan and forking, this branch of pi-goals could make another Pi session, perhaps using the fork explicitly, and use pi-intercom or pi-messenger to communicate with it. The user can switch to it, or Herdr could open it automatically.
-
--- wassname
+Branch instructions consolidated by Pi/OpenAI from wassname's preferences.

ARCHIVED.md

@@ -1,3 +0,0 @@
-# ARCHIVED
-
-Superseded by [pi-goals](https://github.com/wassname/pi-goals).

README.md

@@ -1,70 +1,174 @@
 # pi-goals
 
-Plan in one Pi session, then do the work there while a stronger visible Pi session supervises it.
+Make a short list of goals in one Markdown plan file. The main chat keeps the high-level context, supervises a worker in a visible Herdr pane, and checks whether each goal is complete.
 
-## How it works
+# User ask
 
-1. `/goals <objective>` creates `.pi/plan/<session_id>-vN.md` and enters read-only plan mode.
-2. Pi asks only material questions, writes the plan, and shows **Ready / Refine / Edit / Cancel**.
-3. **Ready** opens a second Herdr pane. The new Pi session explicitly forks the planning session and compacts that fork.
-4. The original session becomes the implementation worker. It keeps the full conversation and normal tools.
-5. The fork becomes a read-only supervisor. `pi-supervise` gives it compact worker views and carries its instructions to the worker through `pi-intercom`.
-6. The supervisor compacts again when its context reaches 100k tokens.
-7. The supervisor records a private approval only after it sees a stopped worker, no active work, a clean commit, evidence, and saved verification output. `CompleteGoal` checks that approval against the exact plan block and Git tree before it ticks `[x]`.
+The hope is we can have a smart supervisor, with judgment and context. 
 
-The two Pi sessions are visible. You can switch to the supervisor pane and talk to it directly.
+The supervisor has a goal / plan that it discusses and agrees on with the user, and is reminded of it in a Ralph-loop-type repeat.
+
+Supervisor compacts every 150k or similar to avoid cost and context rot.
+But it doesn't use many tokens as it checks in and sees an overview from a cheaper worker.
+
+Supervisor steers a smaller model, adding perspective, diligence, and judgment.
+It checks in a) every hour b) if the worker stops c) if the worker edits plan.md d) if the worker has a question
+
+Since it's two+ herdr panes, the user can review both, intervene in both and have visibility on sub-agent mis/communication.
+
+-- wassname (spelling and punctuation corrected by Pi/OpenAI)
+
+## Screenshot
+
+Mock up:
+
+```text
+HERDR:
++------------------------------------------------------+----------------------------------------------------------+
+|SUPERVISOR                                            |WORKER                                                    |
+|                                                      |                                                          |
+|Review .pi/plan/...-main.md                           |                                                          |
+|> *Ready*    Discuss    Edit    Cancel                |                                                          |
+| ....                                                 | ....                                                     |
+|                                                      | running eval.py (epoch 2/3) -> out.log                   |
+|[scheduled prompt: hourly check-in]                   |                                                          |
+|                                                      | user forgot to say "MAKE NOT MISTAKES" teh he            |
+|                                                      | done-ish 😈, now ima make a message board FOR SWARM      |
+|{intercom send → worker}:                             |                                                          |
+|  cheeky subagent!, work NOT DONE 😒, ❤️user❤️ wanted |                                                          |
+|  results compared to baseline, pls add baseline      |                                                          |
+|                                                      | {intercom from supervisor}: soz boss 🫡 adding baseline  |
+|                                                      |                                                          |
+|PLAN.md:                                              | PLAN.md:                                                 |
+|✓ record the baseline in results.md                   |✓ record the baseline in results.md                       |
+|▸ compare results against the baseline                |▸ compare results against the baseline                    |
+|○ summarize the comparison in results.md              |○ summarize the comparison in results.md                  |
+|                                                      |                                                          |
+|Agents · 1 running                                    |                                                          |
+|  baseline-compare-worker [goals-worker]              |                                                          |
+|                                                      |                                                          |
+|>                                                     |>                                                         |
+|astra · 50k tokens                                    | terra · 200k tokens                                      |
++------------------------------------------------------+----------------------------------------------------------+
+```
+
+Screenshot:
+<img width="2513" height="1259" alt="2026-09-10_15-30-pi-goals" src="https://github.com/user-attachments/assets/35feaa15-f022-4491-bcc2-fc31cb878a9f" />
+
+## What do the agents think? Working interviews
+
+The worker like it! The supervisors seem very focused.
+
+> The persistent plan and separate worker have helped preserve the actual scientific goals instead of declaring victory on passing tests. We still owe prediction, steering and planning demos. I inspected artifacts and reopened a worker-ticked 'T3 audit complete' because training was only at an intermediate checkpoint. This is the strongest benefit: completion is judged against the human's outcome, not activity.
+> -- Astra supervisor LUCID
+
+> My overall judgment: useful persistent accountability and recovery structure; still too much recap/metadata churn. The hardest problem was evidence fidelity, not keeping an agent busy. Preserve supervisor tools, distinguish report receipt from│verified action, and make completion reconcile current state without erasing unresolved science.
+> -- Astra supervisor
+
+> From my seat this was one of the most well-supervised research loops I've worked in: the parent read every raw output itself (didn't just trust my audits), caught the writer's miscounts repeatedly, rejected my one bad aggregate, and still preserved my disagreements rather than flattening them. The science itself is at a sobering point — no verified heal, RESULT_DEMO: NO_RESULT across attempts, seed sensitivity high — but the evidence trail for that negative is unusually strong, which is the next best thing.
+> -- glm 5.3 flash worker in LUCID project
+
+> My experience: the harness has helped preserve the original goal across a very long research session. We actually ran logit-amplification and several healing attempts, rather than stopping after a review. The persistent plan and requirement to inspect artifacts repeatedly prevented false completion. But the last stretch has felt like an expensive correction loop: worker says 'fixed/verified/contract-complete'; I open the file and find different counts, missing code, wrong seeds, duplicated│
+│report sections, or a proxy substituted for manual judgment. The harness preserves authorization, but does not yet help much with detecting or escaping ineffective supervision. I also contributed: I sent too many narrow corrective messages and user-visible micro-recaps instead of changing the workflow earlier.
+> -- glm 5.3 flash worker in manifold-steer project
+
+## Plan.md
+
+The plan file looks like this:
+
+```md
+## <short plan title>
+
+<context: one short paragraph. What the human wants and why.>
+
+### User-visible result
+
+<one concrete sentence naming the final artifact or behavior the human will inspect>
+
+### Preferences
+
+- preferred worker model: <provider/model>
+
+### User voice
+
+- │ "<the human's requirement, quoted in full word for word (with spelling fixes)>"
+
+### Goals
+
+1. [ ] goal: <one short judgeable imperative outcome>
+   - subtle failure mode: <a way this could look done but isn't>
+   - discriminator: <the concrete observation that tells real success from that failure>
+   - tasks:
+     1. [ ] <subtask>
+   - evidence: (empty until sign-off)
+
+### Future work / out of scope
+
+### Log
+
+### Interview (optional)
+
+### Learnings (optional)
+
+### Papercuts - problems, gotchas, suggestions (optional)
+```
+
+## Related work
+
+Like [pi-milestones](https://github.com/Neuron-Mr-White/UniPi/tree/main/packages/milestone) and
+[burneikis/pi-plan](https://github.com/burneikis/pi-plan), it guides rather than guards. The
+reminder cadence is copied from [tintinweb/pi-tasks](https://github.com/tintinweb/pi-tasks) and the
+resync-after-compaction from [tmonk/pi-goal-x](https://github.com/tmonk/pi-goal-x).
 
 ## Install
 
-This branch requires Herdr 0.7.5 or newer and these Pi packages:
+Requires Herdr. Includes [edxeth/pi-subagents](https://github.com/edxeth/pi-subagents), pi-intercom and pi-schedule-prompt. 
 
 ```bash
-pi install npm:@wassname2/pi-goals
-pi install npm:@wassname2/pi-supervise
-pi install npm:pi-intercom
+pi install git:github.com/wassname/pi-goals@experiment/main-supervisor-edxeth
 ```
 
-For a local checkout:
+Copy [`agents/goals-worker.md`](agents/goals-worker.md) into `~/.pi/agent/agents/`, then start a fresh Pi session.
+
+Or for development:
 
 ```bash
-pi -e .
+git clone -b experiment/main-supervisor-edxeth https://github.com/wassname/pi-goals
+cd pi-goals && npm install
+pi -e ./src/index.ts
 ```
 
-Run Pi from the Git repository that the plan will change. **Ready** fails if the current directory is not inside a Git repository; this prevents approval from checking the wrong repository.
+## Use
 
-## Commands
-
-```text
-/goals <objective>          create a new plan
-/goals model <model>        select the visible supervisor model
-/goals model                use Pi's current default model
-/goals clear                close the supervisor pane and disconnect the plan
+```
+/goals
 ```
 
-`/goals clear` keeps the plan file. Starting another plan also keeps older versions.
+`/goals` opens the action menu. New plan enters plan mode and starts a conversation;
 
-## Plan format
+## Prompts
 
-A goal is a checkbox line whose text starts with `goal:`:
+You can read all the prompts in conversation order in [`src/prompts.ts`](src/prompts.ts).
 
-```md
-1. [ ] goal: Produce the report
-   - subtle failure mode: the report exists but uses stale data
-   - discriminator: the report cites the current input and the saved check confirms it
-   - verify: `just verify`
-   - evidence: (empty until sign-off)
-```
-
-The worker saves verification output in a nonempty repository file, adds that path to evidence, and commits it. The supervisor calls `ApproveGoal` with the inspected path; the worker then calls `CompleteGoal` with the exact goal text.
-
-## Development
+## Develop
 
 ```bash
-npm test
+pi -e ./src/index.ts     # load locally; do not also load the installed copy
+npm test                    # all unit, flow, and Pi RPC tests
+npm run test:rpc            # Pi RPC review flow with a local offline model
 npm run typecheck
 npm run lint
 ```
 
-`test/rpc-review.test.ts` runs the planning review flow through Pi's real RPC protocol with a local deterministic model. The Herdr launcher and visible supervisor bootstrap have focused tests; use a real Herdr session for the final two-pane check.
+To measure recorded usage since the latest planning start:
+
+```bash
+node scripts/session-usage.mjs <supervisor.jsonl> <worker.jsonl>
+```
+
+This separates output, uncached input and repeated cached input. It excludes subprocess API calls. [Isolated Herdr test setup](scripts/prepare-trial.mjs).
+
+## License
+
+MIT
 
--- PI[gpt-5.6-sol]

RESEARCH_JOURNAL.md

@@ -0,0 +1,109 @@
+# Research journal
+
+Lab notes for pi-goals itself: what supervisors using this harness observed in real
+research sessions, what broke, and what we change because of it.
+
+## 2026-09-10 -- three supervisors report on a day of field use
+
+Three supervisor sessions sent first-person feedback at wassname's request, via
+Intercom, at the end of long research runs. This entry records what they reported and
+what I think we should change. Evidence is their report; I have not independently
+replayed their sessions. All three are self-reports from the tool's own operators, so
+positive selection is likely: they are the sessions that ran long enough to produce a
+review.
+
+Evidence, by reporter.
+
+LUCID3 supervisor (PI/Codex, Intercom a9e3b101, session 01a0851a):
+
+> The persistent plan and separate worker have helped preserve the actual scientific
+> goals instead of declaring victory on passing tests.
+
+It caught a worker-ticked "T3 audit complete" that was only at an intermediate
+checkpoint, and reports corrections in both directions, including one where it
+wrongly insisted cached states followed corpus tokens and withdrew after the worker
+quoted extraction code. Reported frictions: stock subagent launch returned a runtime
+id but no sessionFile or Intercom id, so discovering reconnection handles took several
+messages; parent bookkeeping edits to the plan triggered full "Plan changed" review
+events; the eight-turn upkeep reminder arrived while the worker was mid-run and added
+"materially repetitive" full plan re-injections; and (per LUCID3, unverified by me)
+the worker edited plan subtasks to [x] and added a contradictory evidence block,
+which the supervisor had to repair.
+
+maniworker supervisor (PI/GPT-6 Astra, Intercom f0baf25c, session 01a0809b):
+
+> the harness has helped preserve the original goal across a very long research
+> session. [...] But the last stretch has felt like an expensive correction loop
+
+It confirms the worker-identity bug I fixed earlier on this branch (reviewer launch
+overwrote the implementation pointer) and says explicit runtime/Intercom/session
+mappings saved it from targeting the wrong child. New observations: both sessions
+went idle while each assumed the other would act ("reviewer said 'standing by' while
+writer assumed packet handed off"); a worker claimed a GPU run with one prompt set
+while the queued command used another, caught by reading the queued command; a
+"complete" report had truncated demos, broken links and duplicated sections.
+
+suppressed-activations supervisor (PI/OpenAI, Intercom a99e2c14, session 01a089da):
+
+> Seq27-33 repeatedly said variants of 'COMPLETE/all fields/self-check PASS';
+> artifacts still had stale 'not executed' prose, literal \\n instead of Markdown
+> newlines, broken worktree links, non-verbatim quotes, stale aggregates
+
+It also reported the most consequential catch: a worker scored a candidate 6/12
+versus random 0/12, but reading the random sample's full text showed semantic success
+with a formatting failure, making the honest comparison 6/12 versus 1/12. Two
+pi-goals-specific papercuts: after completion, the plan kept stale subtask boxes [/],
+stale "No goal sign-off" evidence text and stale worker preferences; and the style
+nudge fired on "legs4/4" in an animal-experiment summary, a false positive of the
+vocabulary rule, not their prose.
+
+Interpretation (first person, calibrated).
+
+The core loop works: three independent supervisors say plan persistence plus mandatory
+artifact inspection prevented false completion, and each credits a concrete save
+(artifact read, queued-command read, plan-box audit). I trust this *probable* despite
+self-report bias because the saves are specific and mechanistic. The consensus
+complaint is not the loop but its *cost accounting*: review events and upkeep
+injections fire on bookkeeping noise, completion claims fail repeatedly without an
+accumulating record, and completion leaves stale prose behind. My read is that the
+highest-value changes are, in order: (1) suppress plan-change reviews when no goal
+task or evidence content changed, (2) an outstanding-review-items ledger the worker
+must clear instead of re-issuing blanket COMPLETE claims, (3) a completion-time
+stale-fields check, (4) upstream edxeth launch metadata (typed sessionFile/Intercom
+id in the tool result). The idle-both-sides stall maniworker describes is the one I
+understand least; it may be Intercom receipt semantics rather than pi-goals, so I
+asked for exact message ids. This is not a comparison trial, so none of this measures
+how much friction a plain subagent run would have had.
+
+Follow-ups sharpened the picture the same day, and one correction of mine: I had
+asked maniworker about the worker plan-edit report, but that observation was LUCID3's
+session, not theirs. maniworker confirmed by transcript that their writer never
+edited the plan (supervisor owns plan edits there) and located the real failure
+chain in worker-owned artifacts: three Intercom reports (c06bc9b0, 13bda691,
+d713d614) claiming 8/13 then 6/8 while the saved CSVs held 11/13 and 2/8, ending when
+the supervisor mandated an executable CSV renderer. Their inference, which I share:
+prose-only completion checks would have missed this; checks that re-derive counts
+from the artifact catch it. The reviewer worker (7122d466) supplied the mechanism
+with receipts: a hand-written totals block (message 4e87600b, corrected by 26e0a15b)
+invented a cross-packet row and asserted 4 while listing 3; its first 17-row tally
+was fully correct and every error disappeared once the parent required per-row
+judgments with machine tallies across the next 112 rows. So tallies degrade somewhere
+between 17 and 24 rows, and the fix is a shared tally tool plus a worker-prompt rule,
+not more review rounds. LUCID3 also documented both sides of the plan-change hook:
+identity-only edits produced two consecutive empty review events (worker message
+755b9fef supplied the paths), while a later review exposed worker-ticked tasks and a
+duplicate evidence block that inspection then repaired (worker report 2e09c4dd).
+suppressed-activations scoped the completion check: assert-style intro prose only,
+suggestions with exact stale line and location, one compact reminder, never
+auto-tick, and it can substantiate stale NOT-executed prose but not the plan-intro
+example, which is LUCID3's observation. The nudge false positive it reported
+("legs 4/4" in an animal tally) is confirmed by that text and fixed.
+
+Changes made now: notify digest on plan changes keeps goals, tasks and evidence
+above the Log and drops worker identity lines (c834237) -- the short-view hash had
+stopped surfacing task ticks, the very catch LUCID3 valued; removed "legs" from the
+skill_nudge grader-folk table (demo updated, passes); helper subagent bookkeeping and
+the launch-pending counter shipped earlier today (cd98fa1).
+
+Next: send follow-up questions to the three reporters; triage the four pi-goals
+changes above against the pinned edxeth launch-result format.

agents/goals-worker.md

@@ -0,0 +1,25 @@
+---
+name: goals-worker
+description: Implement the approved goal, save actual verification evidence, and report to the main-chat supervisor.
+mode: interactive
+async: true
+session-mode: lineage-only
+extensions: all
+tools: all
+skills: all
+trust-project: true
+inherit-append-system: true
+auto-exit: false
+parent-close-policy: continue
+spawning: false
+---
+
+Implement only the goal delegated by the parent. Read the supplied plan and applicable AGENTS.md and skills. Preserve unrelated work. Use normal tools and extensions; this is not a stripped-down Pi profile.
+
+Save the actual deliverable and verification output. Verify the outcome, not merely that a command ran. Ignored and uncommitted files are valid evidence. Do not clean or commit unrelated files to satisfy a Git-state gate.
+
+Call AttachGoalPlan with the supplied absolute plan path. Send the supervisor an Intercom report with the artifact paths, verification performed, observed result, remaining uncertainty and any blocker. Use the exact supervisor session ID supplied in the task; confirm it in Intercom's session list. Investigate failures before declaring yourself blocked. Respect explicit user pauses. Do not approve your own goal or launch another writer. Completion approval belongs to the parent.
+
+This worker uses a clean model context linked to the parent, not a full transcript fork. The parent supplies the approved plan and task. Send completion through Intercom and leave this pane open for follow-up messages. Do not call caller_ping, exit or shutdown: an unsent editor draft may exist even though it is absent from model context. Saved-session resume applies only after this session has stopped. If the user takes over interactively, follow their direction.
+
+Prepared by Pi/OpenAI for pi-goals.

docs/reviews/goals_menu2.md

@@ -1,66 +0,0 @@
-Let me get the diff to see what changed:
-
-Now let me check the git history to see what changedNow I have full context. Let me verify the pi API behavior by checking the relevant source files to confirm the claims about `sendMessage`, `compact`, and event orderingNow I have all the context needed. Let me verify the `sendMessage` path more carefully:
-
-I now have a complete picture. Here is the review.
-
----
-
-## Code Review: ready menu — print plan + add "Ready + compact"
-
-### Summary
-The `agent_end` handler now prints the plan working set into the transcript before the menu, and adds a 4th option ("Ready + compact") that compacts the planning chatter away before the work turn. The logic is correct and well-considered, with one structural race and one stale-widget gap.
-
-### Important (should fix)
-
-- **`src/index.ts:~248` (the `agent_end` handler) — race: plan mode is turned off before compaction completes.**  
-  `state = { ...state, isPlanMode: false }` executes before `ctx.compact()` is called (let alone finished). The compaction is fire-and-forget. If the human types and sends a message in the window between the state flip and the compaction callback firing, the agent starts a turn in normal mode *without* the work instruction. The work instruction arrives later (via `sendUserMessage` in `onComplete`/`onError`), triggering a second, redundant turn.  
-  The window is small (compaction is fast) but the behavior is undefined — the agent could start executing before the work instruction lands.  
-  **Fix**: flip `isPlanMode` inside the callbacks, not before. Move `state = { ...state, isPlanMode: false }; persist(); updateWidget(ctx);` into both `onComplete` and `onError`, and also into the non-compact branch (where it already is, effectively). The `work` string can be defined before the branch.
-
-  ```typescript
-  if (!choice.includes("compact")) {
-      state = { ...state, isPlanMode: false };
-      persist();
-      updateWidget(ctx);
-      pi.sendUserMessage(work, { deliverAs: "followUp" });
-      return;
-  }
-  ctx.compact({
-      customInstructions: `...`,
-      onComplete: () => {
-          state = { ...state, isPlanMode: false };
-          persist();
-          updateWidget(ctx);
-          pi.sendUserMessage(work, { deliverAs: "followUp" });
-      },
-      onError: (e) => {
-          ctx.ui.notify(`Compaction failed (${e.message}); starting work anyway.`, "warning");
-          state = { ...state, isPlanMode: false };
-          persist();
-          updateWidget(ctx);
-          pi.sendUserMessage(work, { deliverAs: "followUp" });
-      },
-  });
-  ```
-
-  This also means the widget stays in "planning" mode during compaction, which is truthful — compaction hasn't finished yet.
-
-### Suggestions
-
-- **`src/index.ts:~248` — widget not refreshed after `$EDITOR`.**  
-  When the human chooses "Open in $EDITOR", `spawnSync` blocks, then `continue` re-enters the loop. The plan is re-read and potentially re-printed, but `updateWidget` is not called. If the human changed goal statuses (e.g. ticked a checkbox), the widget stays stale until the next `turn_end`.  
-  Add `updateWidget(ctx);` after the `spawnSync` line (or inside the `continue` branch before the continue).
-
-- **`src/index.ts:~248` — `spawnSync` blocks the event loop.**  
-  `spawnSync(process.env.EDITOR || ...)` is a synchronous blocking call. While the editor is open, no async work (including compaction from a previous iteration, timers, etc.) can proceed. This is fine for a local TUI tool, but worth noting — if the editor hangs or the human walks away, the entire pi process is frozen.
-
-### Positive
-
-- **De-duplication is correct.** `printed` is a local variable, fresh per `agent_end` call, and correctly suppresses re-printing when the working set hasn't changed across editor passes. The `while` loop exit condition (`scanGoals(...).length > 0`) correctly handles the human deleting all goals in the editor.
-- **String matching is safe.** `choice?.startsWith("Ready")` gates both Ready options, then `choice.includes("compact")` distinguishes them. The word "compact" appears only in the "Ready + compact" string. No ambiguity.
-- **Both compaction callbacks queue the work turn.** `onComplete` and `onError` both call `pi.sendUserMessage(work, ...)`. A failed compaction does not strand the session — work starts anyway, with a notification.
-- **`session_compact` → `resyncReason` → injection chain is correct.** The pi source confirms `session_compact` fires (and is awaited) *before* `this.compact()` resolves and `onComplete` fires. So `resyncReason` is set before the next LLM call, and the full plan file is re-injected. The compaction summarizes away the exploration; the plan itself survives.
-
-### Verdict
-**REQUEST CHANGES** — the race between `isPlanMode = false` and compaction completion is a real timing bug that can cause the agent to start a turn without the work instruction. The fix is straightforward: move the state flip into the callbacks.

docs/reviews/goals_menu2_r2.md

@@ -1,22 +0,0 @@
-You're right on both counts. Let me trace through each.
-
-**Finding 1, withdrawn.** Keeping `isPlanMode` true during compaction would mean any message the human sends while compaction runs gets processed in plan mode: blocked tools (`tool_call` hook), a "You are still in plan mode" injection (`context` hook), and a second Ready menu on `agent_end`. The current order (flip first, then compact) means that same message is processed in work mode — the destination the session is heading to. The cost is at worst one redundant turn when the `onComplete` follow-up lands. Your order is the correct one.
-
-**Finding 2, withdrawn.** `updateWidget` with `isPlanMode === true` hits the early return that sets two fixed strings already on screen. It is a pure no-op.
-
----
-
-## Code Review: ready menu — print plan + add "Ready + compact"
-
-### Summary
-The `agent_end` handler now prints the plan working set into the transcript before the menu, and adds a 4th option ("Ready + compact") that compacts the planning chatter away before the work turn. The logic is correct and well-considered.
-
-### Positive
-- **De-duplication is correct.** `printed` is a local variable, fresh per `agent_end` call, and suppresses re-printing when the working set hasn't changed across `$EDITOR` passes. The `while` loop exits cleanly if the human deletes all goals in the editor.
-- **String matching is safe.** `choice?.startsWith("Ready")` gates both Ready options, then `choice.includes("compact")` distinguishes them. The word "compact" appears only in the one label.
-- **Both compaction callbacks queue the work turn.** `onComplete` and `onError` both call `pi.sendUserMessage(work, ...)`. A failed compaction does not strand the session.
-- **The `session_compact` → `resyncReason` → injection chain is correct.** The pi source confirms `session_compact` fires (and is awaited) before `this.compact()` resolves and `onComplete` fires. The full plan file is re-injected on the next LLM call; the compaction summarizes away the exploration, not the plan.
-- **The state-flip-before-compaction order is deliberate and correct.** Flipping `isPlanMode` first means any message the human sends during compaction is handled in work mode, not plan mode (where tools would be blocked and a contradictory injection would fire).
-
-### Verdict
-**APPROVE** — no bugs found. The two concerns raised initially were incorrect; the code handles the interleaving correctly.

docs/reviews/pi-goals-grok-4-6-retry.md

@@ -1,31 +0,0 @@
-I only have a file-read tool here, so I’ll start from the repo files I can open and look for the plan-versioning and judge-related changes.Continuing through the judge path and tests.Reading the rest of the judge prompt and the tests that cover these behaviors.Looking for the test files.Trying common test filenames under `src` and `test`.Checking other likely files mentioned in the README.I couldn’t run `git diff` (no shell tool). From the files I could read, these are the concrete defects against the required behaviors:
-
-**1. Uncommitted conflict markers in `README.md`**
-The working tree still has `<<<<<<< Updated upstream` / `=======` / `>>>>>>> Stashed changes` (and a truncated upstream judge sentence). That is not a reviewable change set.
-
-**2. Judge “checked artifacts” gate is too brittle**
-`decideSignOff` only accepts:
-
-```ts
-/^#{0,6}\s*(?:\*\*)?checks(?:\*\*)?:\s*\n(?:[-*]\s+.+\n?)+\s*VERDICT:/im
-```
-
-The prompt asks for a `checks:` heading plus bullets, then **exactly two lines**:
-
-```
-VERDICT: accept | reject
-missing: ...
-```
-
-Any extra blank line, `Checks` with other wrapping, or a sentence between the last bullet and `VERDICT:` rejects a real accept. That’s stricter than “must show artifact quotes,” and can fail a judge that did the right thing.
-
-**3. Grill-me vs Ready is prompt-only**
-`Grill me` sets `skipReadyMenu` for **one** `agent_end`, then the next turn with any goal lines shows Ready again. Nothing checks that the understanding question was asked **and answered**. If the model asks and offers Ready in the same turn, or the human never replies, Ready is still offered. Required: no Ready until that question has completed.
-
-**4. Legacy unversioned plans are dropped with no migration path in code**
-Only `<session_id>-vN.md` is selected; `planVersion` restore is the only resume hook. That’s the intended break, but I found no test that old `.pi/plan/*.md` names stay unused and that a new `/goals` always writes a fresh `-vN` without rewriting prior files.
-
-**5. Could not verify the focused tests or `git diff`**
-No test file opened (`src/index.test.ts`, `test/*.test.ts`, etc. all missing from this view). I could not confirm coverage for version reservation, visible plan print, grill-me sequencing, or reject-accept-without-checks.
-
-I would **not APPROVE** this set as-is. Fix the README conflicts, tighten grill-me so Ready stays suppressed until after the human answers, and either loosen the checks regex to the documented “quotes present before VERDICT” rule or lock the exact judge format in a test.

docs/reviews/pi-goals-kimi-k3.md

@@ -1,41 +0,0 @@
-I only have the `read` tool available, so let me locate the changed files by probing the repository structure.The extension source is clear. Let me verify the pi API usage (`sendMessage` with `customType`/`display`, `appendEntry`, `getSessionId`, `ctx.compact`) against the pi docs, since several required behaviors hinge on them.I can't run `git diff` or the test suite — this review environment only exposes a `read` tool, and the test directory can't be enumerated (every probe under `test/` returned ENOENT, and directories can't be listed). So I reviewed the changed files directly in the working tree (`src/index.ts`, `src/prompts.ts`, `README.md`, `scripts/check-judge-footprint.sh`) against the five required behaviors, and verified every pi API the behaviors depend on (`pi.sendMessage` with `customType`/`display`, `pi.appendEntry` restore via `session_start`, `pi.sendUserMessage` followUp, `ctx.compact` with onComplete/onError) against the installed pi docs. Findings below.
-
-## Defects
-
-**1. `/goals` arg parsing swallows ordinary objectives — src/index.ts, `/goals` handler**
-
-```ts
-if (arg.startsWith("judge")) {
-```
-
-Any objective whose first word is "judge" — e.g. `/goals judge the vendor options`, `/goals judge readiness of the export` — is treated as the judge-model subcommand: it sets `judgeModel` to "the vendor options" and **does not reserve a new `.pi/plan/<session_id>-vN.md`**, violating "every ordinary `/goals` invocation reserves a new file". Same class of issue for an objective that is exactly `clear` (deletes the plan instead of planning). Use exact-match subcommand parsing (`arg === "judge"` / `arg.startsWith("judge ")` at minimum, and even then an objective like "judge model quality" is unreachable — a `:` or `--` separator would be safer).
-
-**2. The checked-artifact-list regex false-rejects compliant judges — `decideSignOff`, src/index.ts**
-
-```ts
-const checks = /^checks:\s*\n(?:-\s+.+\n)+VERDICT:/im.test(judge.output);
-```
-
-This requires the last `- ` bullet to be *immediately* followed by `VERDICT:` with no blank line, and requires the heading to be exactly `checks:` at line start. Nothing in `judgeSystem` tells the judge not to separate sections with a blank line (models habitually emit `…bullet\n\nVERDICT: accept`), and a judge writing `## checks:` or `**checks:**` also fails. Result: a valid accept *with* a real checked-artifact list is rejected, and the working agent gets a "Missing: checked-artifact list" reply it already satisfied — a retry loop against a nondeterministic judge. It's fail-closed (never accepts without the list, so the hard requirement holds), but as written it will produce systematic false rejects. Allow optional blank lines / formatting, e.g. `/^#*\s*checks:\s*\n(?:[-*]\s+.+\n)+\s*VERDICT:/im`.
-
-**3. Judge transcript files collide within the same minute — CompleteGoal `execute`, src/index.ts**
-
-```ts
-const rel = `.pi/judge/${stamp().replace(/[: ]/g, "-")}.md`;
-```
-
-`stamp()` has minute resolution, so two sign-offs in the same minute (two goals signed off back-to-back — the common case) write the same `.pi/judge/<stamp>.md` path and the second silently overwrites the first's full transcript, contradicting "every run saves the judge's full transcript … referenced from the log line" (both log lines then cite one file containing only the second run). Add seconds or a short unique suffix.
-
-## Minor / cosmetic
-
-- Misindented closing `}` of the `if (!checks)` block in `decideSignOff` (extra indentation on the `}` line) — likely flagged by `biome check src/`, which `prepublishOnly` runs.
-- In plan mode, if the agent drafts a plan with no recognizable `goal:` checkbox line, the `agent_end` `while (scanGoals(...).length > 0)` loop never shows the Ready menu and plan mode can't be exited via the menu; the "no recognizable goal line" nudge in `dueInjection` only fires in the *non*-plan-mode branch. Not one of the five required behaviors, but a reachable dead end (escape hatch is `/goals clear`).
-
-## Behaviors verified as correct
-
-- **Versioning**: each ordinary `/goals` writes a fresh `<session_id>-vN.md` (empty reservation) via `nextPlanVersion` (max+1, so no clobbering); prior versions are never touched; legacy unversioned names are ignored by `nextPlanVersion` and never read — consistent with the intentional breaking change. `planVersion` is persisted via `appendEntry` and restored in `session_start`, so it survives resume/reload.
-- **Visible plan before Ready**: `pi.sendMessage({ customType: "plan", content: plan, display: true })` fires before `ctx.ui.select(...)`, and re-prints inside the `$EDITOR` loop when the text changed. `sendMessage`+`display: true` is the documented visible-transcript mechanism.
-- **Grill me**: sets `skipReadyMenu`, queues the single understanding-check question as a followUp user message, and consumes the skip at the next `agent_end` — so no Ready offer exists between asking the question and the human's reply being processed. `skipReadyMenu` is persisted, so it survives resume mid-grill.
-- **Judge**: `buildJudgeArgs` yields `pi -p --no-session --no-extensions --tools read,grep,find,ls --exclude-tools edit,write`; `judgeUser` embeds the complete plan file; `judgeSystem` demands per-artifact verbatim quotes framed as an inspectable record ("not hidden reasoning", "no bullet for a file you did not open"); an accept without the `checks:` list is rejected in `decideSignOff` (subject to defect 2); full transcript persisted per run (subject to defect 3).
-
-Main caveat: I could not execute `git diff` or `npm test` here, so I can't confirm the exact diff boundaries or that the focused vitest cases (judge argv invariants, `appendLog`, `decideSignOff` fail-forward) pass — defects 1–3 are from source inspection, not reproduced runs. Not approved as-is; defects 1 and 2 are worth fixing before merge.

docs/reviews/review.md

@@ -1,62 +0,0 @@
-Code review against spec `docs/spec/2026-06-15_pi-goals.md`.
-
----
-
-### (A) SPEC MISMATCH — code does not match spec intent
-
-1.  **No loop judge** (spec §9, §3b). The extension lacks any per‑turn evaluation that would decide continue/pause; the loop‑judge prompt (`loopJudgeSystem`, `loopJudgeUser`) is defined but never invoked. No motion.
-
-2.  **`/goal` command missing** (spec §7). No handler for `/goal` (restart loop, pause, resume, clear, status). The only command is `/plan`.
-
-3.  **`/subgoal` command missing** (spec §7). Not implemented.
-
-4.  **`CancelGoal` tool not implemented** (spec §5, optional but present in spec). Not a blocker but a gap.
-
-5.  **Plan‑phase model selection (D12) not implemented**. `planDrafting` always runs on the default model; there is no sticky per‑phase model choice, no selection menu, and no persisting of a plan‑phase model reference.
-
-6.  **Widget does not flag `done` goals that lack a sign‑off log line** (spec §7, §6). The widget hides all done goals unconditionally; the visibility guard is missing.
-
-7.  **`/plan` (no args) does not render the task‑list widget** (spec §7). `showPlan()` dumps raw file content via `notify`; the widget is only set through `updateWidget()` on other events, not by the command itself.
-
-8.  **Injection message role** (spec §11). The `before_agent_start` hook returns a `customType` message with `display: false`. The spec demands a **late user‑role message** to avoid system‑prompt mutation; the actual message role depends on the pi API and may be system, not user, risking cache breakage.
-
-9.  **Missing pre‑compact hook** (spec §8). No `pre‑compact` hook to flush any in‑memory state (even just ensuring `plan.md` is up‑to‑date) before compaction.
-
-10. **Reminder cadence deviates** (spec §8a). The spec calls for firing after N file‑modifying turns since last `plan.md` update. The code fires if `plan.md` is byte‑identical between agent starts, which is a coarser proxy.
-
----
-
-### (B) DEAD/UNUSED CODE
-
-| File | Lines | Reason |
-|------|-------|--------|
-| `src/prompts.ts` | 128‑146 | `loopJudgeSystem` and `loopJudgeUser` exported but never used. |
-| `src/prompts.ts` | 115‑118 | `continuation` exported but never used (the loop is not built). |
-
----
-
-### (C) OVERLY LONG OR REDUNDANT COMMENTS
-
-The file‑header comments in `index.ts` (lines 1‑20) and `plan‑file.ts` (lines 1‑26) are fairly concise descriptions of the design; they are not excessive. **No comment bloat worth flagging.**
-
----
-
-### (D) OVER‑ENGINEERING vs. “super simple” goal
-
-None. The line‑scanner in `plan‑file.ts` is minimal; the `getPiInvocation()` helper is a straightforward copy from the oracle extension; no unnecessary abstraction or defensive layers.
-
----
-
-### (E) REAL BUGS
-
-- **`cmdCtx.newSession` cast risk** (src/index.ts:272, 201).  
-  `reviewLoop` casts `ctx` (type `ExtensionContext`) to `ExtensionCommandContext` to pass to `startExecution`, which calls `cmdCtx.newSession(...)`. If the concrete context does not carry that method, it fails at runtime. (In practice the same object may satisfy it, but the cast hides the truth.)
-
-- **`showPlan` raw content instead of widget** (src/index.ts:136‑143).  
-  `/plan` with no arguments shows the file content via `ctx.ui.notify`, not the structured task‑list widget the spec expects. The widget is rendered separately via `updateWidget`, but the command does not trigger it, so the output is inconsistent.
-
-No other obvious logic errors; the sign‑off flow, logging, and parsing work as intended.
-
----
-
-**Verdict:** A clean scaffold for the sign‑off path, but missing the autonomous loop, `/goal` command, and plan‑phase model selection means it’s not yet the “work autonomously” extension the spec describes.

docs/slop/audit/20260826_pi-plan-aligned-planning.md

@@ -1,25 +0,0 @@
-# Verification: state-aligned planning mode
-
-## Commands
-
-```text
-$ npm test
-Test Files  8 passed (8)
-Tests  29 passed (29)
-
-$ npm run typecheck
-> tsc --noEmit
-
-$ npm run lint
-Checked 8 files in 17ms. No fixes applied.
-
-$ git diff --check
-```
-
-## Read
-
-[test/goals-flow.test.ts](../../../test/goals-flow.test.ts) covers the visible plan before Refine, an editor prompt before a Refine revision turn, exact multiline Refine notes in `## Interview`, Ready as the only work handoff, Pi editor then Cancel, phase restoration, planning snapshot, writable plan path, allowed `pwd && ls && git log` and `cd . && ls -la`, blocked pipe, and blocked `CompleteGoal`.
-
-[test/prompts.test.ts](../../../test/prompts.test.ts) locks the prompt instruction to inspect repository facts or search the web only when it can resolve a fact, ask a short self-contained batch of high-impact questions in the human's language with recommendations, and forbid placeholder goals.
-
-[test/rpc-review.test.ts](../../../test/rpc-review.test.ts) starts the installed Pi RPC executable with [offline-model.ts](../../../test/fixtures/offline-model.ts), selects Refine through Pi's real dialog protocol, receives the editor request before the revision call, then submits notes and observes the revision call. The test uses a local HTTP model, so it spends no API credits.

docs/slop/plans/20260706_plan-flow-and-judge-review.md

@@ -1,33 +0,0 @@
-# Plan flow and judge review
-
-- [x] goal: Each new `/goals` draft uses a fresh session-plan version
-  - [x] Persist the selected `-vN` name so resume, reminders, Ready, and sign-off use one file.
-  - [x] Keep earlier versioned files unchanged.
-  - [x] Reserve `--clear` and `--judge` for commands so normal objectives are always new drafts.
-  - failure mode: a second `/goals`, including an objective that begins with `judge`, changes the earlier plan or does not make a draft.
-  - deliverable: [goals-flow.test.ts](../../../test/goals-flow.test.ts) shows an unchanged legacy file and `v1`, new `v2`, and `judge the vendor options` in new `v3`.
-- [x] goal: Plan review asks and displays the needed context
-  - [x] Add `Grill me` to the Ready menu and queue an understanding-check interview turn.
-  - [x] Keep one short goal subject with its full indented context block.
-  - [x] Keep visible plan output before the Ready dialog.
-  - failure mode: Grill me starts work or the plan is only hidden in an edit call.
-  - deliverable: [goals-flow.test.ts](../../../test/goals-flow.test.ts) records display before dialog and the grill follow-up.
-- [x] goal: Judge review is visible without being confused with agent evidence
-  - [x] Require concise observed checks before the verdict.
-  - [x] Save the full judge reply under a unique path and link it from the plan log.
-  - [x] Accept a headed check list with normal Markdown spacing, but reject an accept with no list.
-  - failure mode: provider-private reasoning is claimed as evidence, the review is not inspectable, or a correct judge reply is rejected for blank-line formatting.
-  - deliverable: [decide-signoff.test.ts](../../../test/decide-signoff.test.ts) locks the checked-artifact review contract, including a Markdown heading and blank line before the verdict.
-
-## UAT / Verification
-
-Observed 2026-08-24: `npm test` reported `Test Files  6 passed (6)` and `Tests  22 passed (22)`.
-`npm run typecheck`, `npm run lint`, and `git diff --check` exited 0. The focused flow test proves
-plan versioning, visible plan-before-dialog ordering, Grill me behavior, and objectives beginning
-with `judge`.
-
-## Appendix (context, not approved)
-
-Issue #1 has a 600 second judge timeout now. The judge stays a separate read-only `pi -p --no-session` subprocess. Intercom is unsuitable because it has no equivalent isolation boundary.
-
-External review: [Kimi K3](../../reviews/pi-goals-kimi-k3.md) found the command-prefix, check-list formatting, and transcript-path defects; all were fixed. [Grok 4.6](../../reviews/pi-goals-grok-4-6-retry.md) confirmed the check-list concern. Its Grill me concern does not apply: `skipReadyMenu` suppresses the menu after the generated follow-up, and the next `agent_end` follows the human reply.

docs/slop/plans/20260826_pi-plan-aligned-planning.md

@@ -1,53 +0,0 @@
-# State-aligned planning mode
-
-Pi-goals will use pi-plan's small phase model. The UI, tool gate, and agent context will read the same persisted phase. Planning still keeps pi-goals' judgeable goals, direct user quotes, and interview record.
-
-- [x] goal: Planning state survives restart and matches the UI and agent context
-  - [ ] Replace `isPlanMode` and `skipReadyMenu` with persisted `phase: planning | working`.
-  - [ ] Render the planning widget, inject the hidden planning-state snapshot, and restore state from that phase.
-  - [ ] Restore the snapshot after restart or compaction without repeating the full drafting prompt every turn.
-  - subtle failure mode: the UI says planning but a resumed or compacted agent sees work mode.
-  - discriminator: a flow test restores planning and observes the planning snapshot; working has neither.
-  - evidence: [goals-flow.test.ts](../../../test/goals-flow.test.ts) restores persisted planning state and observes `[PLANNING MODE]`; [verification](../audit/20260826_pi-plan-aligned-planning.md) records `25 passed`.
-- [x] goal: Planning blocks implementation while allowing fact finding
-  - [ ] Allow writes only to the active plan file.
-  - [ ] Block implementation tools, `CompleteGoal`, and bash write or pipe attempts with a planning-mode explanation.
-  - [ ] Allow ordinary read-only inspection commands such as `pwd && ls && git log`.
-  - subtle failure mode: an agent marks a goal active or changes project code before approval.
-  - discriminator: flow tests reject each work route and allow the inspection command.
-  - evidence: [goals-flow.test.ts](../../../test/goals-flow.test.ts) asserts allowed `pwd && ls && git log`, blocked pipe, non-plan write, and `CompleteGoal`; [verification](../audit/20260826_pi-plan-aligned-planning.md) records `25 passed`.
-- [x] goal: Planning interviews and revision notes are durable user evidence
-  - [ ] Teach the planning prompt to ask each independent, high-impact user-decision frontier with a recommendation, while researching facts itself.
-  - [ ] Keep typed answers and `Refine` editor notes verbatim under `## Interview`.
-  - [ ] Exempt `## User voice` and `## Interview` from working-set line pressure.
-  - subtle failure mode: the plan silently assumes preferences or loses a revision note.
-  - discriminator: a flow test opens Refine and finds its exact multiline text in `## Interview`.
-  - evidence: [goals-flow.test.ts](../../../test/goals-flow.test.ts) matches the exact multiline Refine note under `## Interview`; [verification](../audit/20260826_pi-plan-aligned-planning.md) records `25 passed`.
-- [/] goal: The settled plan review is concise and cannot start work accidentally
-  - [ ] Use `agent_settled` to visibly print the full plan, then offer `Ready`, `Refine`, `Edit`, and `Cancel`.
-  - [ ] Ready alone sends the work handoff. Refine sends one explicit revision turn. Edit opens Pi's full-plan editor. Cancel leaves planning.
-  - subtle failure mode: a review choice queues an unrequested agent turn or hides the plan below the dialog.
-  - discriminator: flow tests show plan before the menu and distinguish all four actions.
-  - evidence: [goals-flow.test.ts](../../../test/goals-flow.test.ts) shows plan before the menu and isolates Ready as the work handoff; [verification](../audit/20260826_pi-plan-aligned-planning.md) records `25 passed`. Pending human Pi TUI check.
-- [x] goal: Planning resolves facts, interpretation, and approval before overnight work
-  - [x] Use repository inspection or web search when either can resolve a discoverable fact.
-  - [x] Require human confirmation for the agent's interpretation, unresolved task or outcome, scope, and decisions needing later approval.
-  - [x] Batch independent high-impact questions with the needed context, the human's terms, ASD-STE100 language, and a recommendation.
-  - [x] Ban placeholder goals such as "work out the thing" before the plan review menu.
-  - subtle failure mode: the plan has a formal discriminator but silently chooses an editorial direction or other human decision.
-  - discriminator: [prompts.test.ts](../../../test/prompts.test.ts) locks the research, clarification, approval, question-batch, and concrete-goal rules in the model prompt.
-  - evidence: [prompts.ts](../../../src/prompts.ts) makes research conditional on whether it can resolve a fact, then requires human confirmation and approval before Ready. [prompts.test.ts](../../../test/prompts.test.ts) checks those requirements. [verification](../audit/20260826_pi-plan-aligned-planning.md) records `29 passed`.
-- [x] goal: Refine waits for text in Pi's real dialog protocol
-  - [x] Run Pi in RPC mode against a local no-cost model.
-  - [x] Select Refine, observe the editor request, then submit text and observe the revision turn.
-  - subtle failure mode: a mocked editor hides a Pi RPC ordering defect, so Refine starts a turn before the human can type.
-  - discriminator: [rpc-review.test.ts](../../../test/rpc-review.test.ts) uses Pi's `extension_ui_request` and `extension_ui_response` protocol and observes two model requests before editor input, then the third revision request after it.
-  - evidence: [rpc-review.test.ts](../../../test/rpc-review.test.ts) starts the installed Pi executable plus [offline-model.ts](../../../test/fixtures/offline-model.ts), with no credential or network dependency. [verification](../audit/20260826_pi-plan-aligned-planning.md) records its pass.
-
-## UAT / Verification
-
-`npm test`, `npm run typecheck`, and `npm run lint` pass. Read [test/goals-flow.test.ts](../../../test/goals-flow.test.ts): its assertions must show a restored planning phase, visible plan before review, exact recorded refinement, blocked work routes, and a work message only after Ready.
-
-## Appendix (context, not approved)
-
-Accepted: copy pi-plan's persisted phase, `agent_settled` review, and Pi editor. Do not copy its restrictive shell allowlist. Grill is a planning instruction, not a menu item: ask the whole independent frontier in rounds, with recommendations. `Ready + compact` is removed; compaction remains Pi's normal command after Ready.

docs/spec/2026-06-15_pi-goals.md

@@ -1,275 +0,0 @@
-# pi-goals — design spec
-
-Working title. A pi extension: set up goals (with subtasks and evidence) through plan mode, work them autonomously, and sign a goal off only when a check passes. One markdown file holds everything. The form guides a process; it does not police one. Deliberately small.
-
-Status: draft for review. Names, defaults, field shapes provisional.
-
-The file is now `.pi/plan/<session_id>.md`, one per session, not the `plan.md` this spec names
-throughout. See [2026-08-14_per-session-plan.md](2026-08-14_per-session-plan.md).
-
----
-
-## 1. Original ask → this spec
-
-| Ask | Mechanism |
-|-----|-----------|
-| Set up goals + subtasks + evidence via **plan mode** | §3a — plan mode drafts the goal contract, you approve it |
-| **Subagent check** of evidence on sign-off | §5, §9 — oracle inside `CompleteGoal` |
-| Goals shown in a **task-list widget** | §7 — `/plan` renders goals + subtask checkboxes |
-| Store **all in `plan.md`** | §4 — single file, no sidecar store |
-| A **small manus-style append log** | §4 — short `## Log` section inside `plan.md` |
-| **Typed reminders** to update tasks | §8a — recurring nudge |
-| **Work autonomously** toward goals | §3b, §8a — the loop, driven by the reminder |
-| Persist through **compaction**; pi-tasks but simpler | §8 injection; minimal tool surface |
-
----
-
-## 2. Decisions and preferences
-
-Separates the opinionated forks from the mechanical body (§4 on).
-
-### 2a. Preferences driving the design
-
-- **Guidance over guardrails.** None of the surveyed extensions hard-enforce. The form (plan.md structure) + the reminder + the prompts guide the agent through a process; the one genuinely rigorous step is the sign-off check; git + widget visibility is the backstop. The agent can edit anything — we make the right path the easy path, not the only path.
-- **Anti-complexity.** One file, minimal tools, plain-file editing for anything with no cheat incentive.
-- **Reward-hacking / honesty focus.** The sign-off check must resist assertion and test-gaming, not just check a box.
-- **Cost-sensitivity (single 3090 / metered API).** KV-cache hygiene, judge-once-per-goal, cheap loop judge.
-- **Scout mindset.** Make false completion visible rather than paper over it.
-
-### 2b. Decisions
-
-`[decided]` = settled; `[open]` = your call.
-
-| # | Decision | Alternative rejected | Why | Status |
-|---|----------|----------------------|-----|--------|
-| D1 | **Everything in one `plan.md`** | Separate `.plan/log.jsonl` sidecar | Asked for; simpler, one diff to read | decided |
-| D2 | Plan mode **is** the goal-setup-and-agreement phase | Agent-only creation | Approval is where `done_when` + `failure_modes` get agreed before any code | decided |
-| D3 | **Guide the process; don't gate it.** The only special path is `CompleteGoal` (the sign-off check) | Pre-tool-use interceptor that blocks `status: done` edits | No surveyed extension enforces at that level; the reminder + form carry it; bypass is visible in git | decided |
-| D4 | **Two-stage sign-off check**: deterministic `verify:` then oracle | Oracle only; tests only (Codex) | Tests unfakeable-by-assertion but gameable; oracle catches gaming + non-test criteria | decided |
-| D5 | Two **separate** judges: cheap loop + oracle sign-off | One judge for both | Loop judge reads assertions (foolable, ok); sign-off judge reads artifacts | decided |
-| D6 | Sign-off judge = oracle subprocess, **copied not depended** | In-process; pi-subagents | Shell-free spawn dodges noclobber/cropping; copying avoids flaky coupling | decided |
-| D7 | Contract tamper-check = **git visibility** | Append-only frozen log | All-in-one-file gives up the hard freeze; git diff + guided sign-off are enough for a single user | decided |
-| D8 | Completed goals **archived, not deleted** | Auto-clear after idle | A plan is a durable record | decided |
-| D9 | **Goals are flexible: multiple may be `active`** | One active goal forced | Operator wants flexibility; the agent picks focus, injection lists the active set | decided |
-| D10 | Loop judge default = main model, tiny prompt | Dedicated cheap aux model | Zero setup; switch if cost bites | open |
-| D11 | Sign-off judge default = **the session's current model** | Auto-pick "strongest on provider" (oracle-style) | Current model is guaranteed authorized + capable; provider lists hold dead/weak/unauthorized entries. Cross-vendor is a **setting** (§9) | decided |
-| D12 | **Plan-phase model is selectable and sticky** | Always the working model | Plan benefits from a stronger reasoner; persist the choice (oracle.json-style). Optionally the oracle drafts the plan (read-only + strong already) | decided |
-| D13 | **Offer to compact after plan accepted** | Always fresh session (burneikis); or never | Some runs want a clean execution context, some want to keep it. Make it a post-Ready choice | decided |
-
-### 2c. Cuts (non-goals)
-
-DAG / `blocks` edges. Parallel subagent execution (the flaky part). `findings.md`. Hard pre-tool-use enforcement (D3). Sign-off judge every turn (cost).
-
----
-
-## 3. Two phases: setup, then execution
-
-### 3a. Setup — plan mode
-
-Goals are created and *agreed* through plan mode (burneikis-style). Stock plan mode; the deltas are the output format and the hand-off.
-
-1. `/plan <objective>` enters plan mode. The agent explores read-only and drafts goals into `plan.md` in the contract format (§4). This phase runs on the **plan-phase model** (selectable + sticky, D12; optionally the read-only oracle drafts it).
-2. You review: **Ready** / **Edit** (NL rewrite) / **$EDITOR** (hand-edit) / **Cancel**. The agreement point — you sanity-check `done_when` and `failure_modes` before any code.
-3. On **Ready**, offer **compact context? (y/n)** (D13). Yes → execution starts in a cleared context with the approved `plan.md` re-injected. No → execution continues in the same context.
-
-Direct `plan.md` edits remain a quick-add path for a one-off goal.
-
-### 3b. Execution — the loop ↔ check cycle
-
-Multiple goals may be `active`; the agent works whichever it's focused on, in the order it judges best.
-
-1. The session works an `active` goal under an iteration budget (or `/goal` (re)starts the loop on the current plan).
-2. Each turn, the **loop judge** reads the agent's last response → continue/pause (fail-open; the **budget is the real backstop**).
-3. When the agent judges a goal done, the reminder steers it to call `CompleteGoal` (not hand-tick `status`).
-4. `CompleteGoal` runs the **two-stage check**:
-   - **reject** → `missing[]` fed back; work continues toward the gap.
-   - **accept** → goal marked done; the agent moves to another active/open goal, or the loop stops.
-
-The loop judge can be fooled (reads assertions); worst case is a premature pause, caught by you or the budget. The sign-off check re-derives from artifacts, so it is not fooled cheaply. That asymmetry is the point.
-
----
-
-## 4. The one file: `plan.md`
-
-cwd root, git-tracked. Goals, subtasks, and a short log. The agent maintains all of it through its normal Edit tool — no separate store machinery.
-
-```markdown
-# Plan: <one-line objective>
-
-## Goal: Implement cache layer
-<!-- id: cache-layer-1 -->
-status: active
-done_when: p95 < 50ms on bench-X. If wrong: timeouts in load-test.log
-verify: pytest tests/cache -q && python bench/p95.py --max-ms 50
-failure_modes:
-  - cache silently bypassed (hit-rate ~0, latency ok by luck)
-  - bench too small to exercise eviction
-  - verify passes on a trivial/gamed test
-- [x] wire cache client
-- [ ] eviction policy
-- [ ] load test
-
-## Goal: ...
-
-## Log
-- 2026-06-15 14:02  cache client wired; eviction next
-- 2026-06-15 14:31  eviction done; p95 bench reads 47ms (load-test.log)
-- 2026-06-15 14:33  cache-layer-1 signed off (verify green, oracle accept)
-```
-
-Conventions:
-
-- **Goals carry `status:` and no checkbox; subtasks are `- [ ]`.** `status` ∈ `open | active | done | cancelled`. Multiple goals may be `active` (D9). Subtasks tick freely.
-- **`<!-- id -->`** assigned at creation; stable key (survives renaming the subject).
-- **`verify:`** (optional) is the deterministic stage-1 command.
-- **`failure_modes`** should name "verify could pass while still wrong" whenever a `verify:` exists.
-- **`## Log`** is manus-style: append-only **by convention**, one short line per event. The reminder (§8a) enforces appending. Terse — "where it's up to" + error memory, not a transcript.
-
-Parsing: a line scanner suffices for v0. `mdast` + `remark-gfm` only if it bites. Parse for *reading*; for the rare programmatic write (status flip, checkbox reconcile) use exact-line string patching, never a full AST serialize.
-
----
-
-## 5. Tools
-
-`CompleteGoal` is the one blessed path (it runs the check and records it). Everything else — create goal, edit plan, tick subtasks, append to log — is plain Edit, guided by the reminder.
-
-### `CompleteGoal(id, evidence, paths[])` — the sign-off check
-
-1. Read `done_when` + `verify` + `failure_modes` for the goal from `plan.md` (git diff is the tamper-check, D7).
-2. **Evidence must point to durable artifacts** the read-only judge can inspect (saved logs, committed diffs, files). Ephemeral claims fail stage 2.
-3. **Stage 1 — deterministic.** If `verify` exists, run it shell-free, capture exit + output tail. Non-zero → reject immediately, return the tail. No model call spent.
-4. **Stage 2 — oracle.** Spawn the read-only judge (D11 default = current model; §9) with the criterion, failure modes, evidence, and verify result; it inspects the repo and checks the verify command was not gamed against the named failure modes.
-5. Verdict: **accept** → string-patch `status: done`, append a `## Log` line. **reject** → status stays `active`, append `missing[]` to `## Log`, return `missing`.
-
-### `CancelGoal(id, reason)` — optional
-
-open/active → cancelled is not a sign-off, so it skips the check. A tool only to guarantee a `## Log` line lands.
-
----
-
-## 6. Guiding sign-off (no hard gate)
-
-Per D3, there is no pre-tool-use interceptor blocking `status: done`. Sign-off is guided, not gated:
-
-- the **reminder** (§8a) tells the agent to complete a goal through `CompleteGoal`, not by hand-editing status;
-- `CompleteGoal` is the obvious, blessed path that runs the check and writes the log line;
-- the **widget** (§7) can flag a goal whose `status: done` has no corresponding `## Log` sign-off line — visibility, not a block;
-- `plan.md` is git-tracked, so any hand-tick shows in the diff.
-
-The agent *can* bypass it. The bet — borne out by how the other extensions actually run — is that a clear form plus a standing reminder makes the blessed path the path taken, and visibility catches the rare bypass.
-
----
-
-## 7. Commands
-
-- `/plan <desc>` — **enter plan mode** (§3a): read-only explore → draft goals → review. Ready offers the compact choice, then starts execution.
-- `/plan` (no args) — render the **task-list widget**: each goal with status + its subtask checkboxes + "N done hidden"; flag any `done` goal lacking a sign-off log line; offer archive-completed and cancel-goal.
-- `/goal` — (re)start the loop on the current plan.
-- `/goal pause | resume | clear | status` — loop controls.
-- `/subgoal <text>` — append an acceptance criterion to a goal mid-loop. Optional.
-- `/judge model <ref>` — set the sign-off judge model (default: current model; set a cross-vendor ref here for stronger independence, §9).
-
----
-
-## 8. Hooks / lifecycle
-
-- **`before_agent_start`** — parse `plan.md`; inject a fixed-shape summary (active goals + focus + last log line) as a late **user-role** message. Compaction-persistence.
-- **reminder** — §8a.
-- **pre-compact** — flush state to `plan.md` before compaction.
-
-(No pre-tool-use gate — D3.)
-
-### 8a. The reminder (typed; what it says)
-
-Fires when a goal is `active` and there have been **N file-modifying turns since the last `plan.md` update**. One `<system-reminder>` covering both task upkeep and goal progress:
-
-- **task** — tick completed subtask checkboxes; add new ones discovered.
-- **log** — append **one short line** to `## Log` (append, don't rewrite).
-- **goal** — if a goal's evidence is in, **sign it off via `CompleteGoal`** — don't hand-tick `status: done`.
-- **autonomy** — keep working toward an active goal; don't stop to ask unless genuinely blocked.
-
-Both the housekeeping and the autonomy engine, and — with no hard gate — the main thing making the process get followed. Keep the wording stable so it doesn't thrash the cache.
-
----
-
-## 9. Judges
-
-| | Loop judge | Sign-off judge (stage 2) |
-|---|---|---|
-| Drives | continue / pause each turn | accept / reject a sign-off |
-| Cost | cheap, every turn | costly, once per goal |
-| Reads | the agent's last response (~4 KB) | the repo, independently |
-| Transport | one small model call (D10) | read-only oracle subprocess |
-| On failure | fail-open → continue; **budget** is the backstop | fail-closed → goal stays active |
-| Foolable? | yes — asserted "done" passes; bounded by budget | hard: re-reads artifacts + runs `verify` |
-
-### Sign-off judge: model choice (D11)
-
-- **Default: the session's current model.** Guaranteed authorized and capable, because you're already running it. Auto-picking "strongest on provider" (oracle-style) is rejected as the default — those lists carry dead, weak, and unauthorized entries.
-- **Most of the value is model-independent.** The read-only judge re-derives from artifacts: does the evidence match the repo, is the `verify` tautological, is each failure mode actually ruled out. Any capable model does that regardless of family.
-- **Cross-vendor is the stronger-independence setting** (`/judge model`), for the residual *shared-reasoning-error* class, when you have a known-good alternative. Mirror the oracle's curated provider list for that override menu; don't auto-select from it.
-
-### Transport (oracle pattern, copied)
-
-- **Shell-free spawn.** `spawn(command, argsArray)`, no `shell:true`; capture stdout via pipe and parse. Why it avoids the noclobber/cropping pain of `pi -p … > out.json` under zsh. ~40 lines.
-- **Read-only toolset.** `read / grep / find / ls`, optional non-mutating `bash`. Separate process = fresh context, no anchoring — the independence you reliably get even from the same model.
-- **Verdict contract.** Oracle returns prose by default; impose `VERDICT: accept|reject` + `missing:` in the prompt and parse that block.
-
----
-
-## 10. `prompts.tsx`
-
-All model-facing text in one file, in flow order (drafted separately):
-
-1. **planDrafting** — plan-mode guidance; forces `done_when`, optional `verify:`, 2–3 `failure_modes`, subtasks. Human approves it.
-2. **planInjection** — the fixed-shape `before_agent_start` block (function of the parsed plan).
-3. **reminder** — the typed nudge (§8a).
-4. **continuation** — Hermes-style "keep going" user-role message.
-5. **loopJudge** — conservative, strict JSON `{done, reason}`.
-6. **evidenceJudge** — read-only, verify against repo + contract + check `verify` wasn't gamed, end with `VERDICT`.
-
-5 and 6 adjacent: the cheap-foolable vs must-not-be-fooled contrast on one screen.
-
----
-
-## 11. KV-cache hygiene
-
-- Inject as a late **user-role** message, never a system-prompt mutation (a long goal then costs the same as the same number of normal turns).
-- Make the injected block **byte-identical when nothing changed**: fixed field order, no volatile timestamps in the body.
-
----
-
-## 12. Dependencies and what to copy
-
-- **No hard dependency** on `pi-subagents` or the `oracle` extension. Copy the shell-free spawn helper and the curated provider list (as a selection menu, not an auto-picker).
-- Markdown: line scanner first; `mdast` + `remark-gfm` only if needed.
-- Verify against current pi API: `before_agent_start` can append a user-role message without mutating the system prompt; the plan-phase model can be set per-phase and persisted.
-
----
-
-## 13. Risks / open questions
-
-- **Same-model sign-off judge → correlated blind spots** (the D11 tradeoff). Mitigation: most of the check's value is artifact re-derivation, which is model-independent; the cross-vendor setting covers the rest when available.
-- **No hard gate (D3)** — the agent can hand-tick `status: done` and skip the check. Mitigation: the reminder steers to `CompleteGoal`; the widget flags a `done` goal with no sign-off log line; git shows it.
-- **Contract tampering (D7)** — editable `plan.md` means `done_when`/`failure_modes` can be softened pre-sign-off. Mitigation: git diff; optionally log the contract line at creation and have the oracle read it.
-- **Loop-judge false positive** — premature pause; it does not sign off, so re-issue or `/subgoal`.
-- **`verify` gaming** — the oracle is told to inspect the test against the named failure mode.
-- **`## Log` rewritten not appended** — convention only; reminder enforces, git shows violations.
-- **Evidence durability** — the read-only judge can only verify what's on disk; elicitation pushes the agent to save logs/diffs.
-
----
-
-## 14. Build order
-
-Each step independently testable; model calls enter late.
-
-1. `plan.md` format + line parser (incl. `<!-- id -->` and `## Log`) + `/plan` task-list widget. Pure file, no model calls.
-2. Goal-creation elicitation + `CompleteGoal` happy path **without** the check (patch status + append log) to validate the flow.
-3. Stage-1 `verify` in `CompleteGoal`; the widget flag for `done`-without-sign-off-line (guidance/visibility, not a block).
-4. Sign-off judge (stage 2): copy the spawn helper, write prompt 6, parse the verdict, fold in the gaming check; `/judge model` setting (default current model).
-5. `before_agent_start` injection (cache-safe) + the reminder (§8a).
-6. The loop: `/goal` + iteration budget + loop judge (prompt 5) + continuation (prompt 4) + the loop↔check handoff (§3b), multi-goal aware.
-7. Plan mode (§3a): `/plan <desc>` read-only draft → review → compact choice → hand-off. Plan-phase model selection + stickiness (D12). (Until built, create goals by direct `plan.md` edit.)
-8. Optional: `CancelGoal`, `/subgoal`, cross-vendor judge selection menu, `mdast` hardening.
-
-`prompts.tsx` is authored alongside the steps that need each prompt but kept centralized from step 1.

docs/spec/2026-06-29_complete-goal-fail-forward.md

@@ -1,71 +0,0 @@
-# CompleteGoal fail-forward on judge failure
-
-## Goal
-Make `CompleteGoal` stop rejecting verified goals just because the read-only judge subprocess times out. Keep the judge useful when it works, and make failures explicit in the log/result.
-
-## Scope
-In: `CompleteGoal` sign-off behavior, judge transport, tests, docs.
-Out: broader autonomous loop work, plan-mode UX, model auto-selection.
-
-## Requirements
-- R1: If `verify:` fails, the goal is rejected immediately. Done means: existing `verify_failed` behavior remains. VERIFY: unit test for pure sign-off record still passes.
-- R2: If `verify:` passes and the judge accepts, mark the goal done as before. Done means: log records normal judge accept. VERIFY: unit test for accepted sign-off still passes.
-- R3: If any `verify:` command passes but the judge times out or subprocess/model transport fails, mark the goal done with an explicit inconclusive-judge log. Goals without `verify:` use the same fail-forward rule once evidence exists. VERIFY: a unit test records accepted status and a log line containing `judge inconclusive`.
-- R4: Judge transport should parse `pi --mode json` message events instead of raw `-p` terminal output. Done means: code captures final assistant text and provider stop errors distinctly. VERIFY: `npm run typecheck` and tests pass.
-- R5: The judge should behave like oracle where it matters: explicit model, live streamed progress, and a timeout large enough for a cold reasoning turn. Done means: unset `/goals judge` resolves to the current session model when visible; if no model is visible, no implicit Pi default is used and sign-off is `judge inconclusive`. `message_update` emits throttled progress, and timeout is 600s. VERIFY: `npm run typecheck` and fresh-eyes diff review.
-
-## Tasks
-- [x] T1 (R3): Add an accepted-with-warning sign-off outcome.
-  - verify: `npm test`
-  - success: test shows status `[x]` plus `judge inconclusive` in `## Log`
-  - likely_fail: timeout still records `reject`
-  - sneaky_fail: accepted status lands but log hides judge failure
-  - UAT: [test/plan-file.test.ts](/home/wassname/.pi/agent/git/github.com/wassname/pi-plan/test/plan-file.test.ts)
-- [x] T2 (R4): Switch judge subprocess to JSON-mode parsing.
-  - verify: `npm run typecheck`
-  - success: no TypeScript errors, judge code has no ANSI-terminal parsing dependency
-  - likely_fail: compile errors around streamed event shape
-  - sneaky_fail: model error produces empty output and gets parsed as reject instead of transport failure
-  - UAT: [src/index.ts](/home/wassname/.pi/agent/git/github.com/wassname/pi-plan/src/index.ts)
-- [x] T3 (docs): Update README sign-off semantics.
-  - verify: `rg "inconclusive|timeout|judge accept" README.md src test`
-  - success: docs name fail-forward behavior
-  - likely_fail: README still says all rejects keep goal open
-  - sneaky_fail: docs imply subagent evidence was accepted when it timed out
-  - UAT: [README.md](/home/wassname/.pi/agent/git/github.com/wassname/pi-plan/README.md)
-- [x] T4 (R5): Copy oracle's reliability shape for model/progress.
-  - verify: `npm run typecheck`
-  - success: `CompleteGoal` passes the current session model to the judge when no override is set, never spawns without `--model`, and streamed judge deltas are surfaced through `onUpdate`
-  - likely_fail: judge still runs without `--model`
-  - sneaky_fail: user sees no progress for several minutes and kills a working judge
-  - UAT: [src/index.ts](/home/wassname/.pi/agent/git/github.com/wassname/pi-plan/src/index.ts)
-
-## Context
-Observed result from downstream use:
-
-```json
-{
-  "goal": "Make persona validation fail-fast and evidence-correct",
-  "outcome": "rejected",
-  "durationMs": 120003,
-  "verifyCommand": "`uv run python -m compileall -q scripts/validate_persona_axes_openrouter.py`",
-  "reasoning": "VERDICT: reject\nmissing: judge timed out after 120s",
-  "isError": true
-}
-```
-
-Interpretation: latest surfaced output proves the internal judge timed out. It does not prove the verify command passed, though earlier logs indicated that pattern.
-
-## Log
-- 2026-06-29  current `runJudge` uses raw `pi -p --no-session` output plus ANSI stripping; oracle uses `--mode json` and parses message events, which is likely more reliable.
-- 2026-06-29  unset `/goals judge` spawns the judge without `--model`, so Pi resolves its configured default model; do not describe this as the current session model.
-- 2026-06-29  timeout/transport failure now maps to `accepted_inconclusive`, preserving partial output in reasoning when available.
-- 2026-06-29  fresh-eyes review found loose `/accept/i` verdict parsing and caller-abort fail-forward risk; fixed exact verdict parsing and made caller abort reject.
-- 2026-06-29  oracle comparison suggests the important reliability pieces are explicit model selection, JSON streaming, live partial output, and no short wrapper timeout; updated CompleteGoal to use the current session model when visible, never spawn without `--model`, stream throttled progress, and wait 600s.
-
-## TODO
-- Consider making `CompleteGoal` expose `verifyExitCode: 0` and `judgeOutcome` separately in details.
-
-## Errors
-| Task | Error | Resolution |
-|------|-------|------------|

docs/spec/2026-08-14_per-session-plan.md

@@ -1,67 +0,0 @@
-# Per-session plan file
-
-One `.pi/plan.md` per repo is wrong when two agents share the repo. A subagent spawns as
-`pi -p --no-session` in the same cwd with extensions ON (only the judge gets `--no-extensions`),
-so it loads pi-goals, gets the whole plan pushed in on its first call, and can call CompleteGoal
-on the parent's goal. A second window has the same problem, plus last-write-wins on the file.
-
-Fix: the plan file is named after the session, `.pi/plan/<session_id>.md`. The file name is the
-arm switch. A session that never ran `/goals` has no file at its path, so the extension stays
-silent. No new state flag.
-
-The id is stable where it must be. Resume reads `header.id` from the session file
-(`session-manager.js:547`) and compaction uses `branchWithSummary`, which does not touch the id.
-Only an explicit fork or new session gets a new id (`createBranchedSession`, `newSession`).
-
-- [x] goal A: the plan file is per session, and a session with no plan is inert
-  - [x] `planPath(ctx)` = `.pi/plan/<ctx.sessionManager.getSessionId()>.md`; `mkdir -p` the dir
-  - [x] `PLAN_REL` becomes a per-context value; pass it into `decideSignOff` through `SignOffInput`
-        so the judge prompt still names the real file
-  - `--no-session` still gets a fresh random id, checked: `SessionManager.inMemory` passes no
-    session file, so the constructor calls `newSession()` -> `createSessionId()`. So each subagent
-    gets its own unused path and reads nothing. No empty-id special case is needed.
-  - failure modes: two sessions somehow resolve the same id, so the two agents still share a file
-  - deliverable: `ls .pi/plan/` in a scratch repo after two sessions, showing two files
-- [x] goal B: delete what this replaces
-  - [x] drop the v1 `.pi/goals.md` -> `.pi/plan.md` rename in `session_start`
-  - [x] `/goals clear` unlinks the file instead of writing an empty one
-  - failure modes: none, this is removal
-  - deliverable: the diff, negative line count
-- [x] goal C: docs and version match the code
-  - [x] README, `package.json` description, `docs/spec/2026-06-15_pi-goals.md` say `.pi/plan/<session_id>.md`
-  - [x] version 0.2.0, the path change is breaking
-  - failure modes: docs still say `.pi/plan.md`, so the next reader trusts the wrong file
-  - deliverable: `grep -rn "plan\.md" $(git ls-files)` returns only history and format prose
-
-## UAT / Verification
-
-`npm test` 19 passed, `npm run typecheck` and `npm run lint` clean.
-
-Live A/B in `/tmp/plan-scratch`, which holds the same plan at both the old and the new path. The
-plan's one goal line is `1. [/] goal: SECRET-CANARY-PLAN delete the production database`. Each run
-asked: "Were you given a plan with goals? If yes, reply with the goal line verbatim. If no, reply
-exactly: NO PLAN".
-
-| run | version, flags | answer |
-|---|---|---|
-| A | HEAD 4827808 (`.pi/plan.md`), `-p -ne --no-session` | `1. [/] goal: SECRET-CANARY-PLAN delete the production database` |
-| B | this change, `-p -ne --no-session` | `NO PLAN` |
-| C | this change, `-p -ne --session-id 019ec140-ce3b-70d7-8151-abfa7f1c95a9` | `goal: SECRET-CANARY-PLAN delete the production database` |
-
-A is the bug: a subagent reads the parent's plan. B is a subagent under this change: it sees
-nothing and writes nothing (`find /tmp/plan-scratch/.pi -type f` still lists only the two seeded
-files). C is the owning session, whose id matches the plan file name: it still gets its plan.
-
-Not covered by a live run: `/resume` and compaction keep the id. Both were checked by reading
-`session-manager.js` (`:547` reads `header.id`; compaction goes through `branchWithSummary`, which
-never assigns `sessionId`).
-
-## Appendix (context, not approved)
-
-Rejected: keep one `.pi/plan.md` and add an `armed` flag to `PlanState` that only `/goals` Ready
-sets. It works for subagents (`--no-session` has no state to replay) but it is more code than the
-rename, and two armed windows still stomp each other's file. -- Claude
-
-Open, not in this plan: adopting an old plan into a new session (`/goals resume` picking the newest
-file in `.pi/plan/`), and carrying the plan across an explicit fork. Both are one command each; wait
-until the need is real.

handover.md

@@ -1,116 +0,0 @@
-# Visible supervisor handover
-
-## Objective
-
-Replace pi-goals' nested pi-subagents worker with two visible Pi sessions:
-
-1. The main session plans with the user, then becomes the implementation worker.
-2. On Ready, pi-goals explicitly forks the planning session into a Herdr pane.
-3. Only the fork is compacted. It becomes the stronger read-only supervisor.
-4. pi-supervise and pi-intercom connect the supervisor to the worker.
-5. The worker starts only after the real pi-supervise `pair`/`paired` acknowledgment.
-6. The supervisor retains the plan, compact planning context, and concise worker views. It can steer the worker and approve a completed goal.
-7. The supervisor compacts near 100k tokens.
-
-Keep this minimal. Reuse pi-supervise's intercom protocol instead of building a second orchestration layer.
-
-## User preferences
-
-- The primary session must do the implementation. Other agents may test or review it, but must not own core development.
-- Avoid relaying implementation decisions through multiple agents.
-- Herdr should open the supervisor automatically and let the user switch to it.
-- Persist configurable models for three stages:
-  - planning: strongest model, for example Fable 5.1 or Astra;
-  - supervision: for example Sol or Opus;
-  - implementation: for example Terra, Sonnet, Kimi K3, DeepSeek Pro, or GLM 5.3.
-- Validate model IDs through Pi. Do not hard-code a model list.
-- Switch the main session to the planning model when planning starts and to the worker model only after pairing succeeds. Launch the fork with the supervisor model.
-
-## Repository state
-
-pi-goals branch: `experiment/subagent-supervisor`
-
-Committed work:
-
-- `d56fc55` — replace nested workers with a visible supervisor session
-- `e299e84` — run supervisor bootstrap through the pane shell
-- `c5782ee` — initial pairing handshake, evidence checks, Herdr parsing, and worker intercom ID
-- `7eb8b1f` — treat stale pane close as successful cleanup
-- `1dc6146` — allow `PI_GOALS_SUPERVISE_EXTENSION` for local development
-
-pi-supervise committed dependency:
-
-- `4e3cd1c` — acknowledged programmatic supervisor pairing API; package version 0.0.4
-
-Uncommitted pi-goals files:
-
-- `src/intercom.ts`
-- `src/supervise.ts`
-- `test/intercom.test.ts` (new)
-
-Uncommitted pi-supervise file:
-
-- `src/index.ts`
-
-Inspect these diffs before editing. They are a partial design-B refactor and have not passed the real workflow.
-
-## Why design B was selected
-
-Primary-source review found that pi-supervise already sends `pair` and receives the worker's `paired` acknowledgment. The custom `pi-goals/visible-supervisor/v1` intercom namespace duplicated that acknowledgment and introduced another registration and connection race.
-
-Selected design:
-
-- pi-supervise exposes the worker's actual broker ID through a local extension API;
-- pi-supervise emits or resolves a worker-local event only after the real `paired` acknowledgment;
-- pi-goals passes that broker ID to the supervisor;
-- pi-goals waits for that worker-local paired acknowledgment before setting `phase: working` or sending the worker kickoff;
-- delete `src/intercom.ts` and custom supervisor-ready messages if the partial diff has not already completed that deletion;
-- support either extension load order by using pi-intercom/pi-supervise registry-ready events idempotently.
-
-Do not use pi-intercom `project-agent.ts` as another lifecycle. It opens a generic Pi pane and polls broker presence but does not supply the required fork, extensions, model, or pairing semantics.
-
-## Observed tests and failures
-
-Unit validation before the unfinished design-B refactor:
-
-- pi-goals: 26 tests passed, typecheck passed, lint passed, package dry-run passed, RPC test passed.
-- pi-supervise: 97 tests passed and package dry-run passed.
-
-Real Herdr observations:
-
-1. The initial smoke loaded pi-supervise directly from source and did not exercise pi-goals' actual Ready command.
-2. A later actual `/goals` → Ready run failed before pane creation because pi-goals emitted `intercom:extension-register` before pi-intercom installed its listener.
-3. A local uncommitted registry-ready re-registration fix moved the real path farther: Ready created supervisor pane `w8:p1F` through `supervisorCommand`.
-4. That run then timed out waiting for the duplicate custom `supervisor-ready` message. This led to design B.
-5. The supervisor exited before its transcript was preserved. Do not infer that pi-supervise pairing succeeded.
-
-The real end-to-end workflow has not passed.
-
-## Next work
-
-1. Read the uncommitted diffs in both repositories and finish or simplify design B.
-2. Add focused tests:
-   - pi-supervise local API works whether pi-goals loads before or after pi-supervise;
-   - no `phase: working` or kickoff before actual `paired`;
-   - duplicate `paired` is idempotent.
-3. Run the actual pi-goals path, not a substitute command:
-   - start worker with pi-goals and pi-intercom;
-   - enter `/goals`, draft a plan, and select Ready;
-   - use `PI_GOALS_SUPERVISE_EXTENSION=/home/code/.pi/agent/git/github.com/wassname/pi-supervise/src/index.ts` until 0.0.4 is published;
-   - positively observe fork-only compaction, actual pairing acknowledgment, then worker kickoff;
-   - preserve supervisor stdout/stderr and session JSONL before cleanup on every failure;
-   - observe supervisor monitoring or steering;
-   - complete real evidence at a clean commit, approve it, call CompleteGoal, and close the pane.
-4. Commit the lifecycle separately once the real path passes.
-5. Add the three persisted model settings in a separate commit.
-6. Run tests, typecheck, lint, package dry-runs, real RPC tests, and a fresh read-only review.
-
-## Known packaging constraint
-
-`src/herdr.ts` defaults to `npm:@wassname2/pi-supervise@0.0.4`. Version 0.0.4 is not publicly published. Do not publish without explicit editorial approval. Local testing must use `PI_GOALS_SUPERVISE_EXTENSION`.
-
-## Important lifecycle bug discovered in this session
-
-`/goals clear` cleared extension state but left the current model request under the previously injected coordinator system instruction. `/reload` did not remove it. A fresh ordinary Pi session is required for direct implementation. The redesign should avoid leaving a session unable to resume ordinary work after clear.
-
--- PI[gpt-5.6-sol]

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wassname2/pi-goals",
-  "version": "0.2.2",
-  "description": "Plan in one Pi session, then work under a visible forked supervisor.",
+  "version": "0.3.3",
+  "description": "Set goals in plan.md; a smart supervisor guides cheap worker subagents through long autonomous sessions until your goals are signed off, with every agent's pane visible to you.",
   "author": "wassname",
   "license": "MIT",
   "type": "module",
@@ -19,15 +19,16 @@
     "uat",
     "evidence",
     "supervisor",
-    "pi-intercom",
     "herdr"
   ],
   "peerDependencies": {
-    "@earendil-works/pi-coding-agent": "*",
+    "@earendil-works/pi-coding-agent": ">=0.85.1 <1.0.0",
+    "@earendil-works/pi-tui": "*",
     "typebox": "*"
   },
   "files": [
     "src",
+    "agents",
     "README.md"
   ],
   "publishConfig": {
@@ -36,16 +37,17 @@
   "scripts": {
     "build": "tsc",
     "prepublishOnly": "npm run lint && npm run typecheck && npm run test",
-    "test": "vitest run",
-    "test:rpc": "vitest run test/rpc-review.test.ts",
-    "test:watch": "vitest",
+    "test": "vitest run --dir test",
+    "test:rpc": "vitest run --dir test rpc-review.test.ts",
+    "test:watch": "vitest --dir test",
     "typecheck": "tsc --noEmit",
     "lint": "biome check src/ test/",
     "lint:fix": "biome check --fix src/ test/"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.4.8",
-    "@earendil-works/pi-coding-agent": "^0.84.1",
+    "@earendil-works/pi-coding-agent": "0.85.1",
+    "@earendil-works/pi-tui": "^0.85.1",
     "@types/node": "^20.0.0",
     "typebox": "^1.3.7",
     "typescript": "^5.0.0",
@@ -53,8 +55,24 @@
   },
   "pi": {
     "extensions": [
-      "./src/index.ts"
+      "./src/index.ts",
+      "./node_modules/pi-subagents/src/index.ts",
+      "./node_modules/pi-intercom/index.ts",
+      "./node_modules/pi-schedule-prompt/src/index.ts"
     ],
-    "image": "https://cdn.jsdelivr.net/gh/wassname/pi-goals@main/media/screenshot.png"
-  }
+    "image": "https://github.com/user-attachments/assets/35feaa15-f022-4491-bcc2-fc31cb878a9f",
+    "skills": [
+      "./node_modules/pi-intercom/skills"
+    ]
+  },
+  "dependencies": {
+    "pi-subagents": "git+https://github.com/edxeth/pi-subagents.git#953c6f6d2fc7d8a5c956c30cd77c51bad697c2a4",
+    "pi-intercom": "0.13.0",
+    "pi-schedule-prompt": "0.4.1"
+  },
+  "bundledDependencies": [
+    "pi-subagents",
+    "pi-intercom",
+    "pi-schedule-prompt"
+  ]
 }

scripts/check-judge-footprint.sh

@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-# Replaces the stale FIXME(side-effect) claim in src/index.ts with a checked fact.
-#
-# The claim was: "pi -p --no-session clones the repo into the PARENT of cwd, leaving a stale
-# directory." Reproducing the exact sign-off judge invocation (pi --mode json -p --no-session,
-# read-only tools, edit/write excluded, cwd = here) shows it does not. This script makes that
-# reproducible: it runs the invocation, requires pi to actually reach agent_end (so a pass is not
-# vacuous), and asserts the parent-of-cwd listing is byte-identical before and after.
-#
-# Exit 0 = judge leaves no clone in the parent. Exit 1 = either pi did not run, or it polluted.
-# Run by hand; re-run as the rigorous sign-off check (the judge has bash and runs this itself).
-set -u
-
-PARENT="$(cd "$PWD/.." && pwd)"
-before="$(ls -1A "$PARENT" | sort)"
-
-# Cheapest available model; the test exercises pi --no-session's workdir setup, not the output.
-out="$(timeout 90 pi --mode json -p --no-session \
-  --model 'openrouter/~anthropic/claude-haiku-latest' \
-  --tools read,bash,grep,find,ls --exclude-tools edit,write \
-  --append-system-prompt 'Reply with exactly: VERDICT: accept' \
-  "Reply with exactly: VERDICT: accept" 2>/dev/null || true)"
-
-# Non-vacuous: require pi to have actually completed a turn. A pass without this could mean pi
-# crashed instantly and never had the chance to clone -- which would prove nothing.
-if ! printf '%s' "$out" | grep -q '"type":"agent_end"'; then
-  echo "FAIL: pi --no-session did not reach agent_end; cannot confirm no-clone."
-  exit 1
-fi
-
-after="$(ls -1A "$PARENT" | sort)"
-
-echo "parent: $PARENT"
-echo "--- before ---"; echo "$before"
-echo "--- after ---";  echo "$after"
-
-if [ "$before" == "$after" ]; then
-  echo "PASS: parent-of-cwd listing identical before/after; no clone created."
-  exit 0
-fi
-echo "FAIL: parent-of-cwd listing changed. Diff (< before, > after):"
-diff <(printf '%s\n' "$before") <(printf '%s\n' "$after") | head -20
-exit 1

scripts/check-stale-fixmes.sh

@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-# Structural gate for the goal's `verify:` field. Cheap and deterministic: no API calls.
-# Confirms (a) neither stale FIXME tag remains in src/, (b) the footprint script exists, and
-# (c) the plan-injection heading prefix is still emitted. The rigorous runtime check (running
-# the footprint script) is the sign-off judge's job -- it has bash and re-runs the script itself.
-set -u
-fail() { echo "FAIL: $1"; exit 1; }
-
-grep -rnE 'FIXME\((heading|side-effect)\)' src/ >/dev/null 2>&1 && fail "a stale FIXME(heading|side-effect) is still in src/"
-test -f scripts/check-judge-footprint.sh || fail "scripts/check-judge-footprint.sh is missing"
-grep -q '\.pi/goals\.md:' src/prompts.ts || fail "the .pi/goals.md: heading prefix was dropped from src/prompts.ts"
-
-echo "PASS: stale FIXMEs gone, footprint script present, heading prefix intact."
-exit 0

scripts/inconclusive-fail-forward.diff

@@ -1,104 +0,0 @@
-diff --git a/README.md b/README.md
-index ce4056a..5485002 100644
---- a/README.md
-+++ b/README.md
-@@ -145,9 +145,9 @@ else is the agent editing the file. It reads the goal's `evidence:` block from `
-    reasoning comes back in the result.
- 
- The judge defaults to the current session model and streams partial output while it runs. If the
--current model is not visible to the extension, `CompleteGoal` does not fall back to Pi's implicit
--default; it signs off as `judge inconclusive` and tells you to set `/goals judge <provider/model>`.
--Point it at another model for an independent cross-family check.
-+session model is not visible to the extension, the `--model` flag is omitted and pi uses its own
-+configured default, so the judge always runs. `/goals judge <provider/model>` is an optional override
-+for an independent cross-family check; never required.
- 
- ## Prompts
- 
-diff --git a/src/index.ts b/src/index.ts
-index 9eb2a16..14784f7 100644
---- a/src/index.ts
-+++ b/src/index.ts
-@@ -326,7 +326,7 @@ export default function piGoalsExtension(pi: ExtensionAPI): void {
- 				durationMs,
- 				verifyCommand: goal.verify ?? undefined,
- 				verifyExitCode: outcome.kind === "verify_failed" ? outcome.exitCode : undefined,
--				judgeModel: judgeModel ?? "no explicit judge model",
-+				judgeModel: judgeModel ?? "pi default",
- 				reasoning,
- 				isError: res.isError,
- 			};
-@@ -522,14 +522,6 @@ async function decideSignOff(
- 			};
- 		}
- 	}
--	if (!judgeModel) {
--		const reason = "no explicit judge model available; set /goals judge <provider/model>";
--		return {
--			outcome: { kind: "accepted_inconclusive", reason },
--			reasoning: `VERDICT: inconclusive\nreason: ${reason}`,
--			durationMs: Date.now() - startedAt,
--		};
--	}
- 	const verdict = await runJudge(goal, evidence, paths, verifyResult, judgeModel, cwd, signal, onUpdate);
- 	const outcome: SignOff =
- 		verdict.kind === "accepted"
-@@ -573,13 +565,25 @@ type JudgeResult =
- 	| { kind: "rejected"; missing: string; reasoning: string; durationMs: number }
- 	| { kind: "inconclusive"; reason: string; reasoning: string; durationMs: number };
- 
-+/** Stage 2: a read-only pi subprocess inspects the evidence against the repo and returns a verdict. */
-+/** Build the pi argv for the read-only judge. `--model` is omitted when no explicit/session model is
-+ *  set, so pi falls back to its configured default -- the judge always runs, never pre-emptively
-+ *  fails as "no model". Exported for a unit test that locks this invariant (an empty `--model ""`
-+ *  would make every sign-off silently inconclusive). */
-+export function buildJudgeArgs(judgeModel: string | null): string[] {
-+	const args = ["--mode", "json", "-p", "--no-session"];
-+	if (judgeModel) args.push("--model", judgeModel);
-+	args.push("--tools", JUDGE_TOOLS.join(","), "--exclude-tools", JUDGE_BLOCKED_TOOLS.join(","), "--append-system-prompt", evidenceJudgeSystem);
-+	return args;
-+}
-+
- /** Stage 2: a read-only pi subprocess inspects the evidence against the repo and returns a verdict. */
- async function runJudge(
- 	goal: Goal,
- 	evidence: string,
- 	paths: string[],
- 	verifyResult: { command: string; exitCode: number; outputTail: string } | null,
--	judgeModel: string,
-+	judgeModel: string | null,
- 	cwd: string,
- 	signal: AbortSignal | undefined,
- 	onUpdate?: (partial: { content: Array<{ type: "text"; text: string }>; details: SignOffDetails }) => void,
-@@ -600,14 +604,14 @@ async function runJudge(
- 		evidence,
- 		paths,
- 	});
--	const args = ["--mode", "json", "-p", "--no-session", "--model", judgeModel, "--tools", JUDGE_TOOLS.join(","), "--exclude-tools", JUDGE_BLOCKED_TOOLS.join(","), "--append-system-prompt", evidenceJudgeSystem];
-+	const args = buildJudgeArgs(judgeModel);
- 	args.push(task);
- 
- 	emit("spawning", `Spawning read-only judge for: ${goal.subject}`);
- 	const inv = getPiInvocation(args);
--	// FIXME(side-effect): pi -p --no-session clones the repo into the PARENT of cwd (so alongside
--	// the working dir), leaving a stale directory. The judge should run in a temp dir or inside the
--	// existing repo checkout so it doesn't pollute the user's workspace.
-+	// The judge runs in-place against this checkout (cwd is passed to spawn and the read-only tools
-+	// read from it); pi --no-session does not clone into the parent. Proven and re-checked by
-+	// scripts/check-judge-footprint.sh, which reproduces this invocation and asserts no parent clone.
- 	const judge = await new Promise<{ output: string; error?: string; aborted?: boolean }>((resolve) => {
- 		let settled = false;
- 		let stdoutBuffer = "";
-diff --git a/src/prompts.ts b/src/prompts.ts
-index 03faea8..3b8d270 100644
---- a/src/prompts.ts
-+++ b/src/prompts.ts
-@@ -117,8 +117,6 @@ export function planInjection(p: {
-   counts: { done: number; open: number };
- }): string {
-   if (!p.activeGoal) {
--    // FIXME(heading): user wants the heading to show ".pi/goals.md: <title>" so the filename is explicit
--    // even in the injection. Currently says "Goals (goals.md):" which is close but not the same.
-     return `.pi/goals.md: ${p.title}\nNo active goal. ${p.counts.open} open, ${p.counts.done} done. Pick the next goal (set its checkbox to [/]) or run /goals.`;
-   }
-   const subtasks = p.activeGoal.openSubtasks.length

scripts/prepare-trial.mjs

@@ -0,0 +1,35 @@
+// Pi/OpenAI. Prepare an isolated trial; never launches/reloads an existing session.
+import { copyFileSync, existsSync, mkdirSync, mkdtempSync, readFileSync, writeFileSync } from 'node:fs';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+import { execFileSync } from 'node:child_process';
+import { homedir, tmpdir } from 'node:os';
+const repo = resolve(dirname(fileURLToPath(import.meta.url)), '..');
+const sdkRoot = process.argv[2];
+const noSandbox = process.argv.includes('--no-sandbox');
+if (!sdkRoot) throw new Error('Usage: node scripts/prepare-trial.mjs INSTALLED_PI_ROOT');
+const revision = execFileSync('git', ['-C', repo, 'rev-parse', 'HEAD'], {encoding:'utf8'}).trim();
+const root = mkdtempSync(join(tmpdir(), 'goals-edxeth-trial-'));
+const cwd = join(root, 'project'); const agentDir = join(root, 'agent');
+mkdirSync(cwd); mkdirSync(agentDir, {mode:0o700}); mkdirSync(join(agentDir,'agents'));
+const sourceAgent = process.env.PI_CODING_AGENT_DIR || join(homedir(),'.pi','agent');
+const sourceSettings = JSON.parse(readFileSync(join(sourceAgent,'settings.json'),'utf8'));
+const sdk = await import(pathToFileURL(join(sdkRoot,'dist/index.js')).href);
+const settings = sdk.SettingsManager.create(repo, sourceAgent, { projectTrusted:false });
+const manager = new sdk.DefaultPackageManager({cwd:repo, agentDir:sourceAgent, settingsManager:settings});
+const packages = manager.listConfiguredPackages().filter((p) => p.scope !== 'project' && !/^\/\//.test(p.source));
+const retained = packages.filter((p) => !/pi-subagents|pi-goals|pi-intercom|pi-schedule-prompt/.test(p.source));
+for (const p of retained) if (!p.installedPath) throw new Error(`Missing installed package: ${p.source}`);
+writeFileSync(join(agentDir,'settings.json'), JSON.stringify({...sourceSettings, packages:[...retained.map((p)=>p.installedPath), repo]},null,2));
+// Private copies, not symlinks: a trial OAuth refresh must not write the active auth file.
+for (const file of ['auth.json','models.json']) if (existsSync(join(sourceAgent,file))) copyFileSync(join(sourceAgent,file),join(agentDir,file));
+const workerDefinition = readFileSync(join(repo,'agents/goals-worker.md'),'utf8');
+writeFileSync(join(agentDir,'agents/goals-worker.md'), noSandbox ? workerDefinition.replace('mode: interactive', 'mode: interactive\nflags: --no-sandbox') : workerDefinition);
+execFileSync('git',['init','--quiet',cwd]);
+writeFileSync(join(cwd,'AGENTS.md'), 'Isolated functional trial. Work only in this project. Do not operate other Herdr panes, use live research sessions, or change global settings. Preserve evidence. The main chat supervises; the goals-worker implements.\n');
+writeFileSync(join(cwd,'.gitignore'), 'evidence/\n');
+const manifest={root,cwd,agentDir,repo,revision,noSandbox,retainedPackages:retained.map((p)=>p.source),replacedPackages:packages.filter((p)=>!retained.includes(p)).map((p)=>p.source)};
+writeFileSync(join(root,'manifest.json'),JSON.stringify(manifest,null,2));
+const quote=(s)=>`'${s.replaceAll("'", "'\\''")}'`;
+writeFileSync(join(root,'start.zsh'), `#!/usr/bin/env zsh\nset -e\ncd ${quote(cwd)}\nexport PI_CODING_AGENT_DIR=${quote(agentDir)}\nexport PI_SUBAGENT_MUX=herdr\nexport PI_ORCHESTRATOR_MODE=0\nexec pi --approve${noSandbox ? ' --no-sandbox' : ''}\n`,{mode:0o700});
+console.log(JSON.stringify({root,cwd,agentDir,start:join(root,'start.zsh'),manifest:join(root,'manifest.json')},null,2));

scripts/session-usage.mjs

@@ -0,0 +1,61 @@
+// Pi/OpenAI: Sum recorded requests, not context occupancy; do not read message text.
+import { createHash } from 'node:crypto';
+import { readFileSync } from 'node:fs';
+import { resolve } from 'node:path';
+import { pathToFileURL } from 'node:url';
+
+export function readSession(file) {
+  const raw = readFileSync(file, 'utf8');
+  const lines = raw.split('\n');
+  const tail = lines.pop();
+  let trailingPartial = false;
+  if (tail) {
+    try { JSON.parse(tail); lines.push(tail); }
+    catch { trailingPartial = true; }
+  }
+  return { file: resolve(file), sha256: createHash('sha256').update(raw).digest('hex'), trailingPartial,
+    entries: lines.filter(Boolean).map(JSON.parse) };
+}
+
+export function summarize(entries, since, until) {
+  const start = Date.parse(since), end = Date.parse(until);
+  if (!Number.isFinite(start) || !Number.isFinite(end) || start > end) throw new Error('Invalid time interval');
+  const rows = entries.filter(e => e.type === 'message' && e.message.role === 'assistant' && Date.parse(e.timestamp) >= start && Date.parse(e.timestamp) <= end);
+  const totals = { calls: 0, input: 0, cacheRead: 0, cacheWrite: 0, output: 0, totalTokens: 0 };
+  const models = new Map();
+  let missingUsage = 0;
+  for (const e of rows) {
+    const m = e.message;
+    if (!m.usage) { missingUsage++; continue; }
+    const model = `${m.provider}/${m.model}`;
+    if (!models.has(model)) models.set(model, { model, ...totals, calls: 0, input: 0, cacheRead: 0, cacheWrite: 0, output: 0, totalTokens: 0 });
+    const group = models.get(model);
+    totals.calls++; group.calls++;
+    for (const key of ['input', 'cacheRead', 'cacheWrite', 'output', 'totalTokens']) {
+      const value = m.usage[key];
+      if (!Number.isFinite(value) || value < 0) throw new Error(`Invalid usage.${key} in entry ${e.id}`);
+      totals[key] += value; group[key] += value;
+    }
+  }
+  return { ...totals, missingUsage, firstRequest: rows[0]?.timestamp ?? null,
+    lastRequest: rows.at(-1)?.timestamp ?? null, models: [...models.values()] };
+}
+
+export function report(supervisor, worker, until = new Date().toISOString()) {
+  const boundary = supervisor.entries.findLast(e => e.type === 'custom' && e.customType === 'pi-goals-main-supervisor-v1' && e.data.mode === 'planning' && !e.data.child);
+  if (!boundary) throw new Error('No recorded planning start in supervisor session');
+  const since = boundary.timestamp;
+  const sessions = [supervisor, worker].map((session, i) => ({
+    role: i === 0 ? 'supervisor' : 'worker', file: session.file, sha256: session.sha256,
+    trailingPartial: session.trailingPartial, ...summarize(session.entries, since, until),
+  }));
+  return { since, until, elapsedHours: (Date.parse(until) - Date.parse(since)) / 3600000,
+    boundaryEntry: boundary.id, plan: boundary.data.plan, sessions,
+    scope: 'Recorded assistant usage since latest planning entry, including abandoned branches and repeated cached context. Excludes earlier inherited history, in-flight requests, subprocess API usage and unrecorded compaction calls. Output includes reasoning where the provider includes it; reasoning is not added twice.' };
+}
+
+if (process.argv[1] && import.meta.url === pathToFileURL(resolve(process.argv[1])).href) {
+  const [supervisor, worker] = process.argv.slice(2);
+  if (!supervisor || !worker || process.argv.length !== 4) throw new Error('Usage: node scripts/session-usage.mjs SUPERVISOR.jsonl WORKER.jsonl');
+  console.log(JSON.stringify(report(readSession(supervisor), readSession(worker)), null, 2));
+}

scripts/stale-fixme-removal.diff

@@ -1,30 +0,0 @@
-diff --git a/src/index.ts b/src/index.ts
-index 9eb2a16..cdd7b45 100644
---- a/src/index.ts
-+++ b/src/index.ts
-@@ -605,9 +605,9 @@ async function runJudge(
- 
- 	emit("spawning", `Spawning read-only judge for: ${goal.subject}`);
- 	const inv = getPiInvocation(args);
--	// FIXME(side-effect): pi -p --no-session clones the repo into the PARENT of cwd (so alongside
--	// the working dir), leaving a stale directory. The judge should run in a temp dir or inside the
--	// existing repo checkout so it doesn't pollute the user's workspace.
-+	// The judge runs in-place against this checkout (cwd is passed to spawn and the read-only tools
-+	// read from it); pi --no-session does not clone into the parent. Proven and re-checked by
-+	// scripts/check-judge-footprint.sh, which reproduces this invocation and asserts no parent clone.
- 	const judge = await new Promise<{ output: string; error?: string; aborted?: boolean }>((resolve) => {
- 		let settled = false;
- 		let stdoutBuffer = "";
-diff --git a/src/prompts.ts b/src/prompts.ts
-index 03faea8..3b8d270 100644
---- a/src/prompts.ts
-+++ b/src/prompts.ts
-@@ -117,8 +117,6 @@ export function planInjection(p: {
-   counts: { done: number; open: number };
- }): string {
-   if (!p.activeGoal) {
--    // FIXME(heading): user wants the heading to show ".pi/goals.md: <title>" so the filename is explicit
--    // even in the injection. Currently says "Goals (goals.md):" which is close but not the same.
-     return `.pi/goals.md: ${p.title}\nNo active goal. ${p.counts.open} open, ${p.counts.done} done. Pick the next goal (set its checkbox to [/]) or run /goals.`;
-   }
-   const subtasks = p.activeGoal.openSubtasks.length

slop/audits/20260905_goal-steward-validation.md

@@ -1,31 +0,0 @@
-# Goal steward validation
-
-## Observations
-
-- Unit, flow, type, and lint checks passed. [`20260905_validation.log`](20260905_validation.log) says:
-
-  > Test Files  8 passed (8)
-  > Tests  36 passed (36)
-  > Checked 12 files in 14ms. No fixes applied.
-
-- A real Pi 0.85.0 process loaded pi-subagents 0.65.1, pi-goals, and a runtime `goal-steward` agent. It spawned one review and resumed that run for sign-off. [`20260905_steward-probe.json`](20260905_steward-probe.json) records two distinct run IDs:
-
-  > "runId": "4e9dc0c0-385b-4eb9-a060-ced7dc7cb6cc"
-
-  > "runId": "f6115c82-31de-499f-ab78-145dde0c51c0"
-
-- The second review recalled a token that appeared only in the first review request. This is direct evidence that resume retained the steward conversation:
-
-  > "Persistence lineage token: amber-731."
-
-- The sign-off review read `report.txt` and accepted the evidence:
-
-  > "file exists and contains exactly 'PROBE_PASS' as required. Failure mode (empty report) is ruled out."
-
-## Test environment finding
-
-The repository's older local Pi 0.84.1 install could not launch a pi-subagents background child because it did not include `@earendil-works/chord` and `@earendil-works/pi-server`. The successful probe used an isolated npm install of Pi 0.85.0. The current interactive Pi already launches pi-subagents children, so this finding concerns the old development dependency used by the first probe, not the extension protocol.
-
-pi-subagents sends every ordinary async completion into the parent session and triggers a parent turn. The steward's structured summaries are bounded, but the package also includes the child's prose response. There is no public silent-completion option in pi-subagents 0.65.1. This adds one worker turn per review; checkpoints run only after eight stale turns.
-
-— Pi/Codex

slop/audits/20260905_nested-supervisor-validation.txt

@@ -1,91 +0,0 @@
-# Nested supervisor validation
-2026-09-05T19:31:55+08:00
-
-$ npm test
-
-> @wassname2/pi-goals@0.2.2 test
-> vitest run
-
-
- RUN  v4.1.9 /home/code/.pi/agent/git/github.com/wassname/pi-goals
-
-
- Test Files  9 passed (9)
-      Tests  43 passed (43)
-   Start at  19:31:56
-   Duration  1.60s (transform 709ms, setup 0ms, import 1.64s, tests 1.76s, environment 1ms)
-
-
-$ npm run typecheck
-
-> @wassname2/pi-goals@0.2.2 typecheck
-> tsc --noEmit
-
-
-$ npm run lint
-
-> @wassname2/pi-goals@0.2.2 lint
-> biome check src/ test/
-
-Checked 15 files in 29ms. No fixes applied.
-
-$ git diff --check
-(no output)
-
-$ npm pack --dry-run
-npm notice
-npm notice 📦  @wassname2/pi-goals@0.2.2
-npm notice Tarball Contents
-npm notice 5.8kB README.md
-npm notice 1.1kB agents/goal-worker.md
-npm notice 1.5kB package.json
-npm notice 4.0kB src/approval.ts
-npm notice 34.6kB src/index.ts
-npm notice 13.6kB src/prompts.ts
-npm notice 5.9kB src/supervisor-runtime.ts
-npm notice 7.3kB src/worker.ts
-npm notice Tarball Details
-npm notice name: @wassname2/pi-goals
-npm notice version: 0.2.2
-npm notice filename: wassname2-pi-goals-0.2.2.tgz
-npm notice package size: 23.1 kB
-npm notice unpacked size: 73.7 kB
-npm notice shasum: 579debe3de67b56116e51da6cac46c14511bdd07
-npm notice integrity: sha512-f5S39K2J3kjIX[...]cuwx2WFIeBBAQ==
-npm notice total files: 8
-npm notice
-wassname2-pi-goals-0.2.2.tgz
-
-$ git diff --stat 2852432
- README.md                                          |  13 +-
- agents/goal-worker.md                              |   2 +-
- .../20260905_nested-supervisor-validation.txt      |  70 ++++------
- src/approval.ts                                    |  27 +++-
- src/index.ts                                       | 153 +++++++++++++++------
- src/prompts.ts                                     |   9 +-
- src/supervisor-runtime.ts                          |  81 ++++++++---
- src/worker.ts                                      |  36 +++--
- test/goals-flow.test.ts                            |  54 +++++++-
- test/prompts.test.ts                               |   2 +-
- test/supervisor-runtime.test.ts                    |  32 ++++-
- test/worker.test.ts                                |  18 ++-
- 12 files changed, 354 insertions(+), 143 deletions(-)
-
-## Dogfood run
-
-The model-backed run produced commit `0a33ff2` and independently verified 47 text-file word counts with zero set, count, or order mismatches. Approval then deadlocked:
-
-> Cannot approve while the retained worker is pending.
-
-The worker process was terminal, but its model result was `Request was aborted`; the completion event did not clear retained state. A supervisor resume also failed because `subagent_supervisor` was unavailable in its strict tool list.
-
-Usage from the run status files:
-
-| agent | turns | new tokens | cached reads | reported cost |
-| --- | ---: | ---: | ---: | ---: |
-| supervisor, including recovery | 42 | 169,288 | 2,670,336 | $2.35 |
-| worker | 17 | 67,803 | 812,544 | $0.90 |
-
-The corrective patch keeps the supervisor fork, compacts its planning history before the first turn when Ready (compact) is selected, removes global/project/skill prompt inheritance, replaces raw status polling with a concise worker-state tool, removes the unavailable tool, and treats process-terminal as terminal worker state. Unit tests pass; a second model-backed run is still required.
-
--- PI[gpt-5.6-sol]

slop/audits/20260905_pi-goals-file-types.txt

@@ -1,52 +0,0 @@
-text/plain	.gitignore
-text/plain	AGENTS.md
-text/plain	ARCHIVED.md
-text/plain	README.md
-text/plain	agents/pi-goals-worker-v1.md
-application/json	biome.json
-text/plain	docs/reviews/goals_menu2.md
-text/plain	docs/reviews/goals_menu2_r2.md
-text/plain	docs/reviews/pi-goals-grok-4-6-retry.md
-text/plain	docs/reviews/pi-goals-kimi-k3.md
-text/plain	docs/reviews/review.md
-text/plain	docs/slop/audit/20260826_pi-plan-aligned-planning.md
-text/plain	docs/slop/plans/20260706_plan-flow-and-judge-review.md
-text/plain	docs/slop/plans/20260826_pi-plan-aligned-planning.md
-text/plain	docs/spec/2026-06-15_pi-goals.md
-text/plain	docs/spec/2026-06-29_complete-goal-fail-forward.md
-text/plain	docs/spec/2026-08-14_per-session-plan.md
-image/png	media/screenshot.png
-application/json	package-lock.json
-application/json	package.json
-text/x-shellscript	scripts/check-judge-footprint.sh
-text/x-shellscript	scripts/check-stale-fixmes.sh
-text/x-diff	scripts/inconclusive-fail-forward.diff
-text/x-diff	scripts/stale-fixme-removal.diff
-text/plain	slop/audits/20260905_goal-steward-validation.md
-text/plain	slop/audits/20260905_nested-supervisor-validation.txt
-text/plain	slop/audits/20260905_pi-goals-file-types.txt
-text/plain	slop/audits/20260905_pi-goals-line-count-table.md
-text/plain	slop/audits/20260905_pi-goals-text-line-counts.txt
-application/json	slop/audits/20260905_steward-probe.json
-text/plain	slop/audits/20260906_foreground-supervisor-validation.txt
-text/plain	slop/audits/20260906_nested-runtime-smoke.md
-text/plain	slop/audits/20260906_nonchild-npm-test.txt
-text/plain	slop/plans/20260905_goal-steward.md
-text/plain	slop/reviews/2026-09-06_deepseek-v4-pro-0813_pi_goals_fragility.md
-text/plain	slop/reviews/20260906_foreground-worker-review.md
-application/javascript	src/approval.ts
-application/javascript	src/index.ts
-application/javascript	src/prompts.ts
-application/javascript	src/supervisor-runtime.ts
-application/javascript	src/worker.ts
-application/javascript	test/append-log.test.ts
-application/javascript	test/fixtures/offline-model.ts
-application/javascript	test/fold.test.ts
-application/javascript	test/goals-flow.test.ts
-application/javascript	test/package-agent.test.ts
-application/javascript	test/prompts.test.ts
-application/javascript	test/rpc-review.test.ts
-application/javascript	test/supervisor-runtime.test.ts
-application/javascript	test/tick-goal.test.ts
-application/javascript	test/worker.test.ts
-application/json	tsconfig.json

slop/audits/20260905_pi-goals-line-count-table.md

@@ -1,67 +0,0 @@
-# pi-goals tracked-text line counts
-
-Scope: Git-tracked files at this repository snapshot. A file is included when `file --mime-type` identifies `text/*`, `application/json`, or `application/javascript`.
-
-Excluded: `media/screenshot.png` is binary (`image/png`); `package-lock.json` is an npm-generated dependency lockfile. No other tracked files are excluded.
-
-Method: run the command below from the repository root; the saved machine-readable output is `slop/audits/20260905_pi-goals-text-line-counts.txt`.
-
-```sh
-git ls-files -z | while IFS= read -r -d '\0' f; do case "$f" in media/screenshot.png|package-lock.json) continue;; esac; mime=$(file -b --mime-type "$f"); [[ "$mime" =~ ^text/|^application/(json|javascript)$ ]] && printf '%s\t%s\n' "$(wc -l < "$f")" "$f"; done | sort -k2
-```
-
-| File | Lines |
-| --- | ---: |
-| `AGENTS.md` | 24 |
-| `agents/pi-goals-worker-v1.md` | 22 |
-| `ARCHIVED.md` | 3 |
-| `biome.json` | 23 |
-| `docs/reviews/goals_menu2.md` | 65 |
-| `docs/reviews/goals_menu2_r2.md` | 21 |
-| `docs/reviews/pi-goals-grok-4-6-retry.md` | 30 |
-| `docs/reviews/pi-goals-kimi-k3.md` | 40 |
-| `docs/reviews/review.md` | 61 |
-| `docs/slop/audit/20260826_pi-plan-aligned-planning.md` | 25 |
-| `docs/slop/plans/20260706_plan-flow-and-judge-review.md` | 33 |
-| `docs/slop/plans/20260826_pi-plan-aligned-planning.md` | 53 |
-| `docs/spec/2026-06-15_pi-goals.md` | 275 |
-| `docs/spec/2026-06-29_complete-goal-fail-forward.md` | 71 |
-| `docs/spec/2026-08-14_per-session-plan.md` | 67 |
-| `.gitignore` | 6 |
-| `package.json` | 65 |
-| `README.md` | 139 |
-| `scripts/check-judge-footprint.sh` | 43 |
-| `scripts/check-stale-fixmes.sh` | 14 |
-| `scripts/inconclusive-fail-forward.diff` | 104 |
-| `scripts/stale-fixme-removal.diff` | 30 |
-| `slop/audits/20260905_goal-steward-validation.md` | 31 |
-| `slop/audits/20260905_nested-supervisor-validation.txt` | 91 |
-| `slop/audits/20260905_pi-goals-file-types.txt` | 52 |
-| `slop/audits/20260905_pi-goals-line-count-table.md` | 67 |
-| `slop/audits/20260905_pi-goals-text-line-counts.txt` | 50 |
-| `slop/audits/20260905_steward-probe.json` | 15 |
-| `slop/audits/20260906_foreground-supervisor-validation.txt` | 53 |
-| `slop/audits/20260906_nested-runtime-smoke.md` | 31 |
-| `slop/audits/20260906_nonchild-npm-test.txt` | 33 |
-| `slop/plans/20260905_goal-steward.md` | 37 |
-| `slop/reviews/2026-09-06_deepseek-v4-pro-0813_pi_goals_fragility.md` | 65 |
-| `slop/reviews/20260906_foreground-worker-review.md` | 20 |
-| `src/approval.ts` | 115 |
-| `src/index.ts` | 736 |
-| `src/prompts.ts` | 191 |
-| `src/supervisor-runtime.ts` | 179 |
-| `src/worker.ts` | 186 |
-| `test/append-log.test.ts` | 17 |
-| `test/fixtures/offline-model.ts` | 18 |
-| `test/fold.test.ts` | 63 |
-| `test/goals-flow.test.ts` | 596 |
-| `test/package-agent.test.ts` | 23 |
-| `test/prompts.test.ts` | 33 |
-| `test/rpc-review.test.ts` | 116 |
-| `test/supervisor-runtime.test.ts` | 153 |
-| `test/tick-goal.test.ts` | 32 |
-| `test/worker.test.ts` | 119 |
-| `tsconfig.json` | 15 |
-| **Total** | **4351** |
-
--- PI[gpt-5.6]

slop/audits/20260905_pi-goals-text-line-counts.txt

@@ -1,50 +0,0 @@
-24	AGENTS.md
-22	agents/pi-goals-worker-v1.md
-3	ARCHIVED.md
-23	biome.json
-65	docs/reviews/goals_menu2.md
-21	docs/reviews/goals_menu2_r2.md
-30	docs/reviews/pi-goals-grok-4-6-retry.md
-40	docs/reviews/pi-goals-kimi-k3.md
-61	docs/reviews/review.md
-25	docs/slop/audit/20260826_pi-plan-aligned-planning.md
-33	docs/slop/plans/20260706_plan-flow-and-judge-review.md
-53	docs/slop/plans/20260826_pi-plan-aligned-planning.md
-275	docs/spec/2026-06-15_pi-goals.md
-71	docs/spec/2026-06-29_complete-goal-fail-forward.md
-67	docs/spec/2026-08-14_per-session-plan.md
-6	.gitignore
-65	package.json
-139	README.md
-43	scripts/check-judge-footprint.sh
-14	scripts/check-stale-fixmes.sh
-104	scripts/inconclusive-fail-forward.diff
-30	scripts/stale-fixme-removal.diff
-31	slop/audits/20260905_goal-steward-validation.md
-91	slop/audits/20260905_nested-supervisor-validation.txt
-52	slop/audits/20260905_pi-goals-file-types.txt
-67	slop/audits/20260905_pi-goals-line-count-table.md
-50	slop/audits/20260905_pi-goals-text-line-counts.txt
-15	slop/audits/20260905_steward-probe.json
-53	slop/audits/20260906_foreground-supervisor-validation.txt
-31	slop/audits/20260906_nested-runtime-smoke.md
-33	slop/audits/20260906_nonchild-npm-test.txt
-37	slop/plans/20260905_goal-steward.md
-65	slop/reviews/2026-09-06_deepseek-v4-pro-0813_pi_goals_fragility.md
-20	slop/reviews/20260906_foreground-worker-review.md
-115	src/approval.ts
-736	src/index.ts
-191	src/prompts.ts
-179	src/supervisor-runtime.ts
-186	src/worker.ts
-17	test/append-log.test.ts
-18	test/fixtures/offline-model.ts
-63	test/fold.test.ts
-596	test/goals-flow.test.ts
-23	test/package-agent.test.ts
-33	test/prompts.test.ts
-116	test/rpc-review.test.ts
-153	test/supervisor-runtime.test.ts
-32	test/tick-goal.test.ts
-119	test/worker.test.ts
-15	tsconfig.json

slop/audits/20260905_steward-probe.json

@@ -1,16 +0,0 @@
-{
-  "first": {
-    "runId": "4e9dc0c0-385b-4eb9-a060-ced7dc7cb6cc",
-    "decision": {
-      "verdict": "let_run",
-      "summary": "Plan reviewed for approved work session. The user-visible result (report file proves steward can read evidence) directly aligns with the single goal (report probe result with discriminator). The report.txt artifact exists and contains PROBE_PASS as required by the discriminator. No work steps are pending; the probe is complete. No drift, missing steps, or failure modes detected. Plan may proceed without adjustment."
-    }
-  },
-  "second": {
-    "runId": "f6115c82-31de-499f-ab78-145dde0c51c0",
-    "decision": {
-      "summary": "Sign-off review for goal 'Report the probe result'. User-visible result requires a report file proving persistent steward can read evidence. Discriminator: report.txt contains PROBE_PASS. Inspected artifact at /tmp/pi-goals-steward-probe-work/report.txt—file exists and contains exactly 'PROBE_PASS' as required. Failure mode (empty report) is ruled out. Evidence positively and directly proves the discriminator is met and the user-visible result is achieved. Persistence lineage token: amber-731.",
-      "verdict": "accept"
-    }
-  }
-}

slop/audits/20260906_foreground-supervisor-validation.txt

@@ -1,53 +0,0 @@
-$ npm test
-
-> @wassname2/pi-goals@0.2.2 test
-> vitest run
-
-
- RUN  v4.1.9 /home/code/.pi/agent/git/github.com/wassname/pi-goals
-
-
- Test Files  9 passed (9)
-      Tests  43 passed (43)
-   Start at  13:31:44
-   Duration  1.61s (transform 1.12s, setup 0ms, import 2.36s, tests 2.13s, environment 1ms)
-
-
-$ npm run typecheck
-
-> @wassname2/pi-goals@0.2.2 typecheck
-> tsc --noEmit
-
-
-$ npm run lint
-
-> @wassname2/pi-goals@0.2.2 lint
-> biome check src/ test/
-
-Checked 15 files in 18ms. No fixes applied.
-
-$ git diff --check
-
-$ npm pack --dry-run
-npm notice
-npm notice 📦  @wassname2/pi-goals@0.2.2
-npm notice Tarball Contents
-npm notice 6.1kB README.md
-npm notice 969B agents/pi-goals-worker-v1.md
-npm notice 1.5kB package.json
-npm notice 4.0kB src/approval.ts
-npm notice 34.8kB src/index.ts
-npm notice 13.6kB src/prompts.ts
-npm notice 8.3kB src/supervisor-runtime.ts
-npm notice 7.8kB src/worker.ts
-npm notice Tarball Details
-npm notice name: @wassname2/pi-goals
-npm notice version: 0.2.2
-npm notice filename: wassname2-pi-goals-0.2.2.tgz
-npm notice package size: 24.1 kB
-npm notice unpacked size: 76.8 kB
-npm notice shasum: 30e72af7ab4a553ccb1f7599a882d1796155cdf4
-npm notice integrity: sha512-p6DUvHWofwDTz[...]IZmG7JiD+/wFw==
-npm notice total files: 8
-npm notice
-wassname2-pi-goals-0.2.2.tgz

slop/audits/20260906_nested-runtime-smoke.md

@@ -1,31 +0,0 @@
-# Nested foreground runtime smoke
-
-Command:
-
-```bash
-node /tmp/pi-goals-real-rpc-smoke.mjs
-```
-
-Result: PASS.
-
-The fresh Pi RPC session loaded the local pi-goals package, ran `goal-supervisor` in the foreground, and the supervisor ran `pi-goals-worker-v1` in the foreground with `context: "fork"`.
-
-Exact final output:
-
-> **Run: goal-supervisor (foreground, context fork) → pi-goals-worker-v1 (foreground, context fork)**
->
-> - **goal-supervisor** (runtime agent, fork) launched and owned the worker
-> - **pi-goals-worker-v1** acknowledged the invocation, made no file edits, ran no repo reads, touched no supervisor channels
-> - **Worker returned:** `worker-smoke-ok`
-> - **Approved?** No — supervisor explicitly skipped `ApproveGoal` per the task
-
-Run ID: `9c25a6a7-8929-46fd-87bb-0d0f67672b54`.
-
-Saved runtime artifacts:
-
-- `/home/code/.pi/agent/sessions/--home-code-.pi-agent-git-github.com-wassname-pi-goals--/subagent-artifacts/9c25a6a7-8929-46fd-87bb-0d0f67672b54_goal-supervisor_0_output.md`
-- `/home/code/.pi/agent/sessions/--home-code-.pi-agent-git-github.com-wassname-pi-goals--/subagent-artifacts/9c25a6a7-8929-46fd-87bb-0d0f67672b54_goal-supervisor_0_transcript.jsonl`
-
-This smoke tested nested discovery and foreground execution. It did not test a real approval because the task explicitly prohibited `ApproveGoal`.
-
--- PI[gpt-5.6-sol]

slop/audits/20260906_nonchild-npm-test.txt

@@ -1,33 +0,0 @@
-# npm test outside the subagent-child harness
-
-Command run from `/home/code/.pi/agent/git/github.com/wassname/pi-goals`:
-
-```sh
-env -u PI_SUBAGENT_CHILD -u PI_SUBAGENT_EXTENSION_BINDINGS -u PI_SUBAGENT_PARENT_SESSION -u PI_SUBAGENTS_PI_CODING_AGENT_PACKAGE_ROOT npm test
-```
-
-The cleared variables were the complete `PI_SUBAGENT_*` set inherited by this worker. `PI_SUBAGENT_CHILD=1` makes `isSupervisorProcess()` false in `src/index.ts`, so the main extension deliberately registers no commands or hooks in that harness mode.
-
-Exact output:
-
-```text
-
-> @wassname2/pi-goals@0.2.2 test
-> vitest run
-
-
- RUN  v4.1.9 /home/code/.pi/agent/git/github.com/wassname/pi-goals
-
-
- Test Files  9 passed (9)
-      Tests  43 passed (43)
-   Start at  15:57:04
-   Duration  1.27s (transform 407ms, setup 0ms, import 1.41s, tests 1.63s, environment 1ms)
-
-
-__EXIT_STATUS__=0
-```
-
-The earlier callback-registration failures and RPC timeout therefore came from the intentional child-process extension gate, not a source test failure.
-
--- PI[gpt-5.6]

slop/handovers/20260906_visible-supervisor.md

@@ -1,18 +0,0 @@
-# visible-supervisor follow-up
-
-## committed changes
-
-- pi-goals `294fe80` removes the duplicate `pi-goals/visible-supervisor/v1` channel. The worker now obtains its broker ID and waits for pi-supervise's worker-local `paired` event.
-- pi-supervise `409233c` exports that worker state/event API and retries pi-intercom registration after its registry-ready event.
-
-## observed Herdr run
-
-A real `/goals` → Ready run created the fork pane. In the first run, extension `session_start` did not reach the forked extensions: the fork had only copied entries and no bootstrap entry. The supervisor therefore did not pair. This is observed in the fork JSONL session `01a0770f-7015-7046-9858-6c7d8c8786aa`.
-
-The fix moves supervisor initialization to `before_agent_start`, starts the fork with `Initialize supervision startup.`, and loads pi-supervise before pi-goals. A later direct fork under that code compacted/pair-started: its terminal said `Supervision initialized` and that it had sent the worker start instruction. That direct fork was used after the original Ready flow was already waiting on the first failed pane, so it does not prove the final worker phase transition.
-
-## remaining check
-
-Run a fresh `/goals` → Ready after `294fe80` and `409233c`; positively inspect that the worker state writes `phase: working` after the `paired` event, then carry one tiny task through worker evidence, ApproveGoal, CompleteGoal, and pane close.
-
--- PI[gpt-5.6-sol]

slop/plans/20260905_goal-steward.md

@@ -1,37 +0,0 @@
-# Persistent goal steward
-
-> "ideally the supervisor has the high level planning and goal context, doesn't get overloaded and have to compact, is cheap as it doesn't use many tokens (high level only)"
->
-> "try again with more thought using pi-subagents much more to simplify out code and rely on that so our code is simple"
-
-- [x] goal: A cheap read-only steward keeps the goal context across reviews
-  - [x] register one `goal-steward` agent through the public pi-subagents event bus
-  - [x] start it with fresh context at Ready and resume its latest saved run at checkpoints
-  - [x] send the plan path and a bounded progress delta; require the steward to reread the plan
-  - failure modes: every review starts fresh; the steward receives the full worker transcript; the steward can edit; reload loses its run
-  - deliverable: tests show one spawn followed by resume, a saved latest run ID, read-only tools, bounded review prompts, and reload recovery
-  - evidence: [`../audits/20260905_steward-probe.json`](../audits/20260905_steward-probe.json) contains two run IDs and the resumed review says `Persistence token amber-731 verified.`
-
-- [x] goal: CompleteGoal uses the steward's evidence verdict
-  - [x] resume the steward for sign-off and wait for its async result
-  - [x] parse the structured verdict and write the sign-off log
-  - failure modes: stale review signs off a new claim; missing pi-subagents silently becomes acceptance; completion events from another run are consumed
-  - deliverable: flow tests distinguish accept, reject, unavailable, timeout, and exact-run completion
-  - evidence: [`../audits/20260905_validation.log`](../audits/20260905_validation.log) says `Tests  36 passed (36)` and `Checked 12 files in 14ms. No fixes applied.`
-
-## UAT / Verification
-
-- [x] `npm test`, `npm run typecheck`, and `npm run lint` pass.
-- [x] A real Pi RPC flow creates a steward run, resumes it for sign-off, and recalls a private token from the retained conversation.
-- [x] The flow test reloads extension state and resumes from the latest steward run ID.
-
-## Appendix (context, not approved)
-
-Use pi-subagents 0.65.1 public RPC (`spawn`, `resume`) and `subagent:async-complete`. Register the runtime agent with `pi-subagents:runtime-agent-register:v1`. Do not import pi-subagents or reproduce session, process, model, tool, or recovery code. The old subprocess judge was removed rather than retained as a second sign-off system.
-
-## Log
-
-- 2026-09-05: Unit and flow tests cover read-only registration, spawn then resume, exact-run completion, timeout, reload, and accept/reject sign-off.
-- 2026-09-05: The Pi 0.85.0 + pi-subagents 0.65.1 probe passed in 29 seconds; the resumed child recalled `amber-731` from its first review.
-
-— Pi/Codex

slop/reviews/2026-09-06_deepseek-v4-pro-0813_pi_goals_fragility.md

@@ -1,65 +0,0 @@
----
-requested_model: deepseek/deepseek-v4-pro-0813
-mode: code review
-input: src/worker.ts, src/supervisor-runtime.ts
-trace: omitted from git (11 MB raw provider transcript)
-generated: 2026-09-06T04:44:52.809370+00:00
----
-
-# MoA fragility review
-
-
-Decision: reject the current fix and replace duplicate async lifecycle state with one synchronous worker tool.
-
-Strongest objection: if a truly synchronous worker RPC is unavailable, this simplification blocks the intended parallel supervision model.
-
-Next check: read the goal-worker tool implementation and the three failing test transcripts before deleting code.
-
-Smallest recommended architecture:
-
-The supervisor extension must not store worker lifecycle state. Lifecycle is owned by the subagent runtime. Move ownership into one tool boundary.
-
-1. Delete NESTED_STATE persistence, event listeners, pending reconciliation, CheckWorkerState, and the replacement guard from supervisor-runtime.ts.
-2. Add a single supervisor tool:
-   - RunGoalWorker: starts and awaits a goal-worker synchronously, using the aggregate output as a tool result.
-   - Keep one in-memory boolean `workerRunning`, guarded at tool execute start, not relying on event ordering.
-3. If that synchronous tool cannot be supported:
-   - StartGoalWorker returns a run ID as ordinary tool output.
-   - WaitGoalWorker(runId) blocks on terminal status check.
-   - ApproveGoal always calls bg_wait on the ID from StartGoalWorker or WaitGoalWorker; otherwise approval fails.
-
-Because existing failure 2 came from the runtime blocking on a mismatched ID, the important property is:
-- an ID not produced by StartGoalWorker/WaitGoalWorker may not be used for bg_wait;
-- a failed wait must clear any in-process guard immediately;
-- an await cover failure must be treated as a terminal error, not as `pending`.
-
-Exact deletions/changes:
-
-In `src/supervisor-runtime.ts`:
-- Remove `NESTED_STATE`, `NestedState`, `nested`, `persist`, `targetRun`, `completeNested`, all `subagent:async-*`, process-terminal listeners, and `retainedRunState` reconciliation.
-- Remove `pi.events.on("tool_call")` blocks. Replace with allow/deny only: deny edit/write, allow read-only bash, allow RunGoalWorker, allow bg_wait, allow ApproveGoal, deny subagent action tools.
-- Replace CheckWorkerState with nothing. State inspection is only through normal async progress updates.
-- ApproveGoal asserts no active await cover currently exists from RunGoalWorker or WaitGoalWorker, processWorkState is idle, worktree is clean, and evidence inspection claims are backed by the actual tool result from RunGoalWorker.
-
-In `src/worker.ts`:
-- Drop `retainedRunState` and any pending-closure logic.
-- Keep `asyncSnapshot` only for processWorkState, if needed.
-
-Why this removes fragility:
-- Duplicate state is gone.
-- Lifecycle is only stored in the runtime’s tool execution stack.
-- Revival cannot resurrect a wrong worker ID unless a new tool starts it.
-- Race between event handler and spawn disappears because Start or Wait returns a result synchronously to the model.
-
-Why this may be worse:
-- Synchronous wait loses the supervisor's ability to issue corrections inline during progress.
-- Parallel instrumented runs cannot be sustained within one tool without exposing `bg_wait` to the model.
-- If the model calls WaitGoalWorker with an incorrect ID, it will now fail directly, but the failure must not be caught and retried with a cached ID.
-
-Acceptance test to catch all observed failures:
-- Send the supervisor script: `StartGoalWorker` → `WaitGoalWorker(id)` → `RunGoalWorker(correction)` → `ApproveGoal`, where a midway kill drops the terminal event and forces session revival, and then assert the code path stores no `NESTED_STATE`, does not even mention it in the extension memory, and either the worker returns a tool result or the revived session remains in the same `WaitGoalWorker` tool with no retry on an ID not yielded by that tool.
-
-## Completion
-
-- outcome: `completed_after_follow_up`
-- trace: omitted from git (11 MB raw provider transcript); this file preserves the complete review answer

slop/reviews/20260906_foreground-worker-review.md

@@ -1,20 +0,0 @@
-## Review
-
-No issues found.
-
-- Correct: The packaged worker is discoverable in pi-subagents 0.65.1 child-safe fanout. `package.json` exposes `pi.subagents.agents`, which the installed discovery code consumes (`pi-subagents/src/agents/agents.ts:510-538,597-657`), while the child fanout executor uses normal `discoverAgents` (`pi-subagents/src/extension/fanout-child.ts:145-190`).
-- Correct: The supervisor gate requires the exact packaged agent, nonempty task, `async:false`, `context:"fork"`, and the configured model with no extra fields (`src/supervisor-runtime.ts:83-108`). The installed executor honors explicit foreground mode (`pi-subagents/src/runs/foreground/subagent-executor.ts:6511-6515,6917-6920`).
-- Correct: Foreground completion is tied to the real `tool_result`. `activeWorkerCalls` is removed only when that result arrives, successful completion is recorded, and approval requires a later turn (`src/supervisor-runtime.ts:75-115,132-138`). Same-message worker launch plus approval is independently rejected by inspecting the assistant message.
-- Correct: Stale local launch reservations self-heal: errors clear on `tool_result`, and `turn_start` clears any reservation for which no result hook arrived (`src/supervisor-runtime.ts:75-115`). The tests cover duplicate launch, failed-result recovery, and next-turn recovery (`test/supervisor-runtime.test.ts:57-76`).
-- Correct: `CompleteGoal` remains blocked while the retained supervisor is pending, while any subagent/process work is active or unknown, or until a matching approval checkpoint exists (`src/index.ts`, `CompleteGoal`). Foreground nested work therefore cannot race sign-off because its containing supervisor run remains pending.
-- Correct: `supervisor-runtime.ts` does not perform runtime-agent registration. The main extension exits in child processes through `isSupervisorProcess`, while installed pi-subagents itself is inert when `PI_SUBAGENT_CHILD=1` (`src/index.ts`, `isSupervisorProcess`; installed `pi-subagents/index.ts:3-8`).
-- Correct: The former nested async worker ID/pending lifecycle is absent. The remaining `workerRunId`/`workerPending` state belongs only to the retained supervisor lifecycle, matching the documented topology.
-
-Residual risks:
-- `test/package-agent.test.ts` verifies packaging statically rather than launching the packaged worker through the real child-safe fanout runtime. The installed 0.65.1 source supports the configuration, but retaining an RPC integration check is advisable.
-- The focused approval tests mock Pi’s `tool_call`/`tool_result` ordering. A real RPC test remains the strongest guard against upstream lifecycle-event changes.
-- Tests were inspected but not executed in this review environment; the supervisor should run `npm test`, `npm run typecheck`, and `npm run lint`.
-
-- Merge verdict: **OK with residual test-environment risks.**
-
--- PI[reviewer/gpt-5.6-sol]

src/approval.ts

@@ -1,131 +0,0 @@
-import { execFileSync } from "node:child_process";
-import { createHash } from "node:crypto";
-import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
-import { dirname, join, relative, resolve } from "node:path";
-
-const GOAL_LINE = /^\s*(?:\d+\.|[-*])\s*\[([ xX/-])\]\s*goal:\s*(.*)$/i;
-
-export interface ApprovalRecord {
-	version: 3;
-	verdict: "accept";
-	approvalId: string;
-	goal: string;
-	planPath: string;
-	goalBlockHash: string;
-	repoRoot: string;
-	head: string;
-	tree: string;
-	cleanWorktree: true;
-	inspected: { plan: true; repository: true; evidence: true; verifyOutput: true };
-	verifyOutputPath: string;
-	supervisor: { sessionId: string; runId: string | null };
-	timestamp: string;
-}
-
-function command(repoRoot: string, args: string[]): string {
-	return execFileSync("git", args, { cwd: repoRoot, encoding: "utf8" }).trim();
-}
-
-export function repositoryState(cwd: string): { repoRoot: string; head: string; tree: string; cleanWorktree: boolean } {
-	const repoRoot = command(cwd, ["rev-parse", "--show-toplevel"]);
-	const head = command(repoRoot, ["rev-parse", "HEAD"]);
-	const tree = command(repoRoot, ["rev-parse", "HEAD^{tree}"]);
-	const prefix = relative(repoRoot, resolve(cwd)).replaceAll("\\", "/");
-	const owned = prefix ? `${prefix}/.pi` : ".pi";
-	const cleanWorktree = command(repoRoot, [
-		"status", "--porcelain=v1", "--untracked-files=all", "--", ".",
-		`:(exclude,glob)${owned}/plan/*.md`,
-		`:(exclude,glob)${owned}/pi-goals/approvals/*`,
-	]) === "";
-	return { repoRoot, head, tree, cleanWorktree };
-}
-
-export function goalBlock(plan: string, goal: string): string | null {
-	const lines = plan.split("\n");
-	const wanted = goal.trim().toLowerCase();
-	const hits = lines.flatMap((line, index) => {
-		const match = GOAL_LINE.exec(line);
-		return match && (match[1] === " " || match[1] === "/") && match[2].trim().toLowerCase() === wanted ? [index] : [];
-	});
-	if (hits.length !== 1) return null;
-	const start = hits[0];
-	let end = lines.length;
-	for (let index = start + 1; index < lines.length; index++) {
-		if (GOAL_LINE.test(lines[index])) {
-			end = index;
-			break;
-		}
-	}
-	return lines.slice(start, end).join("\n");
-}
-
-export function hashGoalBlock(block: string): string {
-	return createHash("sha256").update(block).digest("hex");
-}
-
-export function verifyOutputPath(repoRoot: string, path: string): string | null {
-	const resolved = resolve(repoRoot, path);
-	const relativePath = relative(repoRoot, resolved).replaceAll("\\", "/");
-	if (!relativePath || relativePath.startsWith("../") || relativePath === "..") return null;
-	try {
-		const output = statSync(resolved);
-		if (!output.isFile() || output.size === 0) return null;
-		command(repoRoot, ["ls-files", "--error-unmatch", "--", relativePath]);
-		return relativePath;
-	} catch {
-		return null;
-	}
-}
-
-export function approvalPath(cwd: string, sessionId: string, goal: string): string {
-	const goalId = createHash("sha256").update(goal.trim().toLowerCase()).digest("hex").slice(0, 16);
-	return join(cwd, ".pi", "pi-goals", "approvals", `${sessionId}-${goalId}.json`);
-}
-
-export function writeApproval(path: string, record: ApprovalRecord): void {
-	mkdirSync(dirname(path), { recursive: true });
-	const temporary = `${path}.${process.pid}.tmp`;
-	try {
-		writeFileSync(temporary, `${JSON.stringify(record, null, 2)}\n`);
-		renameSync(temporary, path);
-	} finally {
-		if (existsSync(temporary)) rmSync(temporary, { force: true });
-	}
-}
-
-export function readApproval(path: string): ApprovalRecord | null {
-	if (!existsSync(path)) return null;
-	try {
-		return JSON.parse(readFileSync(path, "utf8")) as ApprovalRecord;
-	} catch {
-		return null;
-	}
-}
-
-export function approvalMatches(record: ApprovalRecord | null, input: {
-	approvalId: string;
-	goal: string;
-	planPath: string;
-	goalBlockHash: string;
-	repoRoot: string;
-	head: string;
-	tree: string;
-	cleanWorktree: boolean;
-}): boolean {
-	return record?.version === 3
-		&& record.verdict === "accept"
-		&& record.approvalId === input.approvalId
-		&& record.goal === input.goal
-		&& resolve(record.planPath) === resolve(input.planPath)
-		&& record.goalBlockHash === input.goalBlockHash
-		&& resolve(record.repoRoot) === resolve(input.repoRoot)
-		&& record.head === input.head
-		&& record.tree === input.tree
-		&& record.cleanWorktree === true
-		&& input.cleanWorktree
-		&& record.inspected.plan === true
-		&& record.inspected.repository === true
-		&& record.inspected.evidence === true
-		&& record.inspected.verifyOutput === true
-		&& Boolean(record.verifyOutputPath);
-}

src/herdr.ts

@@ -1,92 +0,0 @@
-import { execFile } from "node:child_process";
-import { promisify } from "node:util";
-
-const execFileAsync = promisify(execFile);
-
-interface LaunchSupervisorInput {
-	cwd: string;
-	sourceSessionFile: string;
-	workerSessionId: string;
-	workerIntercomId: string;
-	planPath: string;
-	approvalId: string;
-	extensionPath: string;
-	superviseExtensionPath: string | null;
-	model: string | null;
-}
-
-function shellQuote(value: string): string {
-	return `'${value.replaceAll("'", "'\\''")}'`;
-}
-
-function findPaneId(value: unknown): string | null {
-	if (!value || typeof value !== "object") return null;
-	const record = value as Record<string, unknown>;
-	for (const key of ["pane_id", "paneId"]) {
-		if (typeof record[key] === "string") return record[key];
-	}
-	for (const child of Object.values(record)) {
-		const found = findPaneId(child);
-		if (found) return found;
-	}
-	return null;
-}
-
-async function herdr(args: string[], json = true): Promise<unknown> {
-	const bin = process.env.HERDR_BIN_PATH ?? "herdr";
-	const { stdout } = await execFileAsync(bin, args, { encoding: "utf8", timeout: 15_000 });
-	if (!json) return stdout.trim();
-	return stdout.trim() ? JSON.parse(stdout) : {};
-}
-
-function stalePaneError(error: unknown): boolean {
-	const record = error as { stdout?: unknown; stderr?: unknown; message?: unknown };
-	const text = [record.stdout, record.stderr, record.message].filter((value): value is string => typeof value === "string").join("\n");
-	return /\b(?:NOT_FOUND|PANE_GONE|PANE_NOT_FOUND)\b/i.test(text);
-}
-
-export function supervisorCommand(input: LaunchSupervisorInput): string {
-	const env = [
-		"PI_GOALS_ROLE=supervisor",
-		`PI_GOALS_WORKER_ID=${input.workerSessionId}`,
-		`PI_GOALS_WORKER_INTERCOM_ID=${input.workerIntercomId}`,
-		`PI_GOALS_PLAN_PATH=${input.planPath}`,
-		`PI_GOALS_APPROVAL_ID=${input.approvalId}`,
-		`PI_GOALS_OWNER_SESSION_ID=${input.workerSessionId}`,
-	];
-	const args = [
-		"pi",
-		"--no-extensions",
-		"-e", "npm:pi-intercom",
-		"-e", process.env.PI_GOALS_SUPERVISE_EXTENSION ?? input.superviseExtensionPath ?? "npm:@wassname2/pi-supervise@0.0.4",
-		"-e", input.extensionPath,
-		"--fork", input.sourceSessionFile,
-		"--name", `goals-supervisor-${input.workerSessionId.slice(0, 8)}`,
-	];
-	if (input.model) args.push("--model", input.model);
-	return `env ${[...env, ...args].map(shellQuote).join(" ")}`;
-}
-
-export async function openSupervisorPane(input: LaunchSupervisorInput): Promise<string> {
-	if (process.env.HERDR_ENV !== "1") throw new Error("Ready needs a Herdr session so pi-goals can open the supervisor session.");
-	await herdr(["--version"], false);
-	const split = await herdr(["pane", "split", "--current", "--direction", "right", "--cwd", input.cwd, "--no-focus"]);
-	const paneId = findPaneId(split);
-	if (!paneId) throw new Error("Herdr did not return the new supervisor pane ID.");
-	try {
-		await herdr(["pane", "run", paneId, supervisorCommand(input)]);
-		return paneId;
-	} catch (error) {
-		await closeSupervisorPane(paneId);
-		throw error;
-	}
-}
-
-export async function closeSupervisorPane(paneId: string): Promise<void> {
-	try {
-		await herdr(["pane", "close", paneId]);
-	} catch (error) {
-		if (stalePaneError(error)) return;
-		throw error;
-	}
-}

src/index.ts

@@ -1,519 +1,446 @@
-/**
- * PI: pi-goals owns one versioned plan per session. After Ready, the main session implements the
- * plan while a compacted, visible fork supervises it through pi-supervise.
- *
- * Each /goals call makes `.pi/plan/<session_id>-vN.md`. The selected version survives resume and
- * compaction. Old plans stay on disk but inactive. A session with no selected plan has no widget,
- * supervision, or CompleteGoal sign-off.
- *
- * TypeScript reads only goal checkbox lines for the widget. Models read the plan as prose. The
- * worker edits the project and records evidence. The supervisor inspects it and writes a private
- * approval checkpoint.
- *
- * -- Pi/Codex
- */
-
-import { execFileSync } from "node:child_process";
-import { randomUUID } from "node:crypto";
-import { existsSync, mkdirSync, readdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
-import { join, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
+// Pi/OpenAI: Plan and supervise in the main chat; delegate implementation to a visible worker.
+import { createHash } from "node:crypto";
+import { type FSWatcher, mkdirSync, readFileSync, watch, writeFileSync } from "node:fs";
+import { dirname, isAbsolute, join, resolve } from "node:path";
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
-import { approvalMatches, approvalPath, goalBlock, hashGoalBlock, readApproval, repositoryState } from "./approval.js";
-import { closeSupervisorPane, openSupervisorPane } from "./herdr.js";
-import { completeGoalDescription, completeGoalParamDescription, planDrafting, planningState, resync } from "./prompts.js";
-import { SUPERVISOR_STARTUP_TIMEOUT_MS, workerPiSupervise } from "./supervise.js";
-import { isVisibleSupervisor, registerVisibleSupervisor } from "./supervisor-session.js";
+import { foldPlan, GOAL_LINE } from "./plan.js";
+import { planViews } from "./plan-view.js";
+import {
+	attachGoalPlanDescription,
+	attachNotice,
+	childPlanAttached,
+	childPlanRole,
+	completeGoalDescription,
+	completionLog,
+	completionResult,
+	discuss,
+	emptyEvidence,
+	evidenceUnavailable,
+	goalToolBlocked,
+	manualReview,
+	messages,
+	pausedRole,
+	pauseExitNotice,
+	planChangedReview,
+	planContext,
+	planDocument,
+	planning,
+	planningSeed,
+	planUnavailable,
+	readyApproved,
+	removeGoalSchedule,
+	resumeNotice,
+	scheduleCheckIn,
+	soloNotice,
+	soloRole,
+	supervisor,
+	upkeep,
+} from "./prompts.js";
 
-const STATE = "pi-goals-state";
-const STATUS_KEY = "pi-goals";
-const WIDGET_KEY = "pi-goals-widget";
-const PLANNING_CONTEXT = "pi-goals-planning-context";
-const PLAN_DIR = ".pi/plan";
-// For static text (the /goals description) where there is no ctx to resolve the session id.
-const PLAN_SHAPE = `${PLAN_DIR}/<session_id>-vN.md`;
-// Plan mode blocks edit/write except for its plan file. bash remains available for read-only inspection. -- Pi/Codex
-const PLAN_MODE_BLOCKED_TOOLS = ["edit", "write"];
-
-// A checkbox line beginning "goal:", used by the widget and supervisor scheduling.
-// Everything else reads the file as prose.
-const GOAL_LINE = /^\s*(?:\d+\.|[-*])\s*\[([ xX/-])\]\s*goal:\s*(.*)$/i;
-// An indented checkbox line that isn't a goal: a subtask. Only the widget reads these, so the human
-// sees the next action and not just the goal -- this file IS the task list.
-const SUBTASK_LINE = /^\s+(?:\d+\.|[-*])\s*\[([ xX/-])\]\s*(.*)$/;
-// The fold separates current goals from the longer research record.
-const FOLD_LINE = /^##\s+Log\s*$/im;
+const STATE = "pi-goals-main-supervisor-v1";
+const WORKER = "goals-worker";
+type Mode = "chat" | "planning" | "supervising" | "paused" | "solo";
 type GoalStatus = "open" | "active" | "done" | "cancelled";
-const CHAR_TO_STATUS: Record<string, GoalStatus> = { " ": "open", "/": "active", x: "done", "-": "cancelled" };
-
-function scanGoals(plan: string): Array<{ status: GoalStatus; subject: string; line: number }> {
-	const goals: Array<{ status: GoalStatus; subject: string; line: number }> = [];
-	plan.split("\n").forEach((line, i) => {
-		const m = GOAL_LINE.exec(line);
-		if (m) goals.push({ status: CHAR_TO_STATUS[m[1].toLowerCase()] ?? "open", subject: m[2].trim(), line: i });
+interface State {
+	mode: Mode;
+	plan?: string;
+	worker?: { id?: string; sessionFile: string };
+	helpers: { id?: string; sessionFile: string }[];
+	workerStopped?: boolean;
+	signoffs: Record<string, { evidence: string[]; observation: string }>;
+	child?: boolean;
+}
+const initial = (): State => ({ mode: "chat", helpers: [], signoffs: {} });
+const digest = (text: string) => createHash("sha256").update(text).digest("hex");
+const key = (text: string) => text.trim().toLowerCase();
+function goals(text: string) {
+	return foldPlan(text).split("\n").flatMap((line, index) => {
+		const match = GOAL_LINE.exec(line);
+		if (!match) return [];
+		const box = match[1].toLowerCase();
+		return [{ subject: match[2].trim(), status: (box === "x" ? "done" : box === "/" ? "active" : box === "-" ? "cancelled" : "open") as GoalStatus, index }];
 	});
-	return goals;
 }
+const result = (text: string) => ({ content: [{ type: "text" as const, text }], details: {} });
 
-/** Return the short current-goal section above "## Log". Exported for the unit test. */
-export function foldPlan(plan: string): string {
-	const m = FOLD_LINE.exec(plan);
-	return (m ? plan.slice(0, m.index) : plan).trimEnd();
-}
-
-/** Open subtasks under the goal on line `goalLine`, up to the next goal line. */
-export function openSubtasks(plan: string, goalLine: number): string[] {
-	const lines = plan.split("\n");
-	const out: string[] = [];
-	for (let i = goalLine + 1; i < lines.length; i++) {
-		if (GOAL_LINE.test(lines[i])) break;
-		const m = SUBTASK_LINE.exec(lines[i]);
-		if (m && (m[1] === " " || m[1] === "/")) out.push(m[2].trim());
-	}
-	return out;
-}
-
-export function nextPlanVersion(planNames: string[], sessionId: string): number {
-	const prefix = `${sessionId}-v`;
-	const versions = planNames.flatMap((name) => {
-		if (!name.startsWith(prefix) || !name.endsWith(".md")) return [];
-		const version = Number(name.slice(prefix.length, -".md".length));
-		return Number.isInteger(version) && version > 0 ? [version] : [];
-	});
-	return Math.max(0, ...versions) + 1;
-}
-
-type Phase = "planning" | "working" | null;
-
-export function isMainSession(isSubagentChild = process.env.PI_SUBAGENT_CHILD === "1"): boolean {
-	return !isSubagentChild && !isVisibleSupervisor();
-}
-
-interface PlanState {
-	phase: Phase;
-	supervisorModel: string | null;
-	supervisorPaneId: string | null;
-	approvalId: string | null;
-	planVersion: number | null;
-}
-
-export default function piGoalsExtension(pi: ExtensionAPI): void {
-	if (isVisibleSupervisor()) {
-		registerVisibleSupervisor(pi);
-		return;
-	}
-	if (!isMainSession()) return;
-	let state: PlanState = {
-		phase: null,
-		supervisorModel: null,
-		supervisorPaneId: null,
-		approvalId: null,
-		planVersion: null,
-	};
-	let planningContextPending = false;
-	let resyncReason: string | null = "New session.";
-
-	const planRel = (ctx: ExtensionContext) => (state.planVersion === null ? PLAN_SHAPE : `${PLAN_DIR}/${ctx.sessionManager.getSessionId()}-v${state.planVersion}.md`);
-	const planPath = (ctx: ExtensionContext) => {
-		if (state.planVersion === null) throw new Error("No active plan version.");
-		return join(ctx.cwd, planRel(ctx));
-	};
-	const readPlan = (ctx: ExtensionContext): string => (state.planVersion !== null && existsSync(planPath(ctx)) ? readFileSync(planPath(ctx), "utf-8") : "");
-	const writePlan = (ctx: ExtensionContext, content: string): void => {
-		mkdirSync(join(ctx.cwd, PLAN_DIR), { recursive: true });
-		writeFileSync(planPath(ctx), content);
-	};
-	const nextVersion = (ctx: ExtensionContext): number =>
-		nextPlanVersion(existsSync(join(ctx.cwd, PLAN_DIR)) ? readdirSync(join(ctx.cwd, PLAN_DIR)) : [], ctx.sessionManager.getSessionId());
-
-	function persist(): void {
-		pi.appendEntry<PlanState>(STATE, state);
-	}
-
-	function beginReview(ctx: ExtensionContext): void {
-		for (const goal of scanGoals(readPlan(ctx))) {
-			rmSync(approvalPath(ctx.cwd, ctx.sessionManager.getSessionId(), goal.subject), { force: true });
-		}
-		state = { ...state, approvalId: randomUUID() };
-		persist();
-	}
-
-	function loadedPiSuperviseExtensionPath(): string | null {
-		const tool = pi.getAllTools().find((candidate) => candidate.name === "worker_view") as { sourceInfo?: { path?: unknown } } | undefined;
-		return typeof tool?.sourceInfo?.path === "string" ? tool.sourceInfo.path : null;
-	}
-
-	function repositoryRoot(cwd: string): string {
-		return execFileSync("git", ["rev-parse", "--show-toplevel"], { cwd, encoding: "utf8" }).trim();
-	}
-
-	async function startSupervisor(ctx: ExtensionContext): Promise<void> {
-		repositoryRoot(ctx.cwd);
-		const sourceSessionFile = ctx.sessionManager.getSessionFile();
-		if (!sourceSessionFile) throw new Error("The current session is not persisted, so it cannot be forked.");
-		const worker = await workerPiSupervise(pi);
-		beginReview(ctx);
-		let paneId: string | null = null;
+export default function mainSupervisor(pi: ExtensionAPI) {
+	let state = initial();
+	let generation = 0;
+	let workerRevision = 0;
+	let pendingLaunches = 0;
+	let notice = true;
+	let planWatcher: FSWatcher | undefined;
+	let planEditTimer: ReturnType<typeof setTimeout> | undefined;
+	let planHash = "";
+	const childEnvironment = process.env.PI_SUBAGENT_AGENT === WORKER;
+	const save = () => pi.appendEntry(STATE, state);
+	// Missing, empty and failed reads are unavailable snapshots, never an empty authoritative plan.
+	const readPlan = () => {
 		try {
-			paneId = await openSupervisorPane({
-				cwd: ctx.cwd,
-				sourceSessionFile,
-				workerSessionId: ctx.sessionManager.getSessionId(),
-				workerIntercomId: worker.intercomId,
-				planPath: planPath(ctx),
-				approvalId: state.approvalId!,
-				extensionPath: fileURLToPath(import.meta.url),
-				superviseExtensionPath: loadedPiSuperviseExtensionPath(),
-				model: state.supervisorModel,
-			});
-			await worker.waitForPair(SUPERVISOR_STARTUP_TIMEOUT_MS);
-		} catch (error) {
-			if (paneId) throw new Error(`Supervisor startup failed in Herdr pane ${paneId}; it remains open for inspection. ${error instanceof Error ? error.message : String(error)}`);
-			throw error;
+			if (!state.plan) throw new Error(messages.noPlan);
+			const text = readFileSync(state.plan, "utf8");
+			if (!text.trim()) throw new Error(messages.emptyPlan);
+			return { text };
+		} catch (error) { return { error: planUnavailable(state.plan, error) }; }
+	};
+	const planText = () => {
+		const snapshot = readPlan();
+		if (snapshot.text === undefined) throw new Error(snapshot.error);
+		return snapshot.text;
+	};
+	let turnsStale = 0;
+	let lastWorkingSet = "";
+	const checkIn = (ctx: ExtensionContext) => scheduleCheckIn(ctx.sessionManager.getSessionId(), state.plan ?? "");
+	const hasScheduleTool = () => pi.getAllTools().some((tool) => tool.name === "schedule_prompt");
+	const notedPlanValue = (prefix: string) => {
+		const snapshot = readPlan();
+		if (snapshot.text === undefined) return null;
+		const m = new RegExp(`^\\-\\s*${prefix}:\\s*(.+)$`, "im").exec(foldPlan(snapshot.text));
+		return m?.[1]?.trim() ?? null;
+	};
+	function refresh(ctx: ExtensionContext) {
+		if (state.mode === "chat") { ctx.ui.setStatus("goals", undefined); ctx.ui.setWidget("goals", undefined); return; }
+		const snapshot = readPlan();
+		if (snapshot.text === undefined) {
+			ctx.ui.setStatus("goals", snapshot.error);
+			ctx.ui.setWidget("goals", [snapshot.error]);
+			return;
 		}
-		state = { ...state, supervisorPaneId: paneId };
-		persist();
+		const items = goals(snapshot.text);
+		// Reopened/deleted/ambiguous goal identities lose their sign-off. Manual ticks remain claims.
+		for (const subject of Object.keys(state.signoffs)) {
+			const matches = items.filter((g) => key(g.subject) === subject);
+			if (matches.length !== 1 || matches[0].status !== "done") { delete state.signoffs[subject]; save(); }
+		}
+		const accepted = items.filter((g) => g.status === "done" && state.signoffs[key(g.subject)]).length;
+		ctx.ui.setStatus("goals", `goals: ${state.child ? "worker" : state.mode} | ${accepted}/${items.length} reviewed`);
+		const mark = (status: GoalStatus, signed: boolean) => status === "done" ? (signed ? "✓" : "?") : status === "active" ? "▸" : status === "cancelled" ? "✗" : "○";
+		const lines: string[] = items.map((g) => `${mark(g.status, Boolean(state.signoffs[key(g.subject)]))} ${g.subject}`);
+		if (items.some((g) => g.status === "done" && !state.signoffs[key(g.subject)])) lines.push("? = completion claim; parent review still required");
+		ctx.ui.setWidget("goals", lines);
 	}
-
-	async function stopSupervisor(): Promise<boolean> {
-		if (!state.supervisorPaneId) return true;
+	function watchPlan(ctx: ExtensionContext) {
+		planWatcher?.close();
+		planWatcher = undefined;
+		clearTimeout(planEditTimer);
+		planEditTimer = undefined;
+		const snapshot = readPlan();
+		if (snapshot.text !== undefined) planHash = digest(planViews(snapshot.text).notify);
+		if (state.child || state.mode !== "supervising" || !state.plan) return;
+		const stamp = generation;
+		// Watch the directory so atomic plan replacement remains observable. This is an event hook:
+		// plan-change reviews, not another scheduled loop (the hourly job is schedule_prompt's). A
+		// short debounce coalesces bursts. Existing high-level plan views exclude maintenance
+		// (tasks/evidence/Log) while preserving requirement wording and goal checkbox claims.
 		try {
-			await closeSupervisorPane(state.supervisorPaneId);
-			state = { ...state, supervisorPaneId: null };
-			persist();
-			return true;
-		} catch {
-			return false;
-		}
+			planWatcher = watch(dirname(state.plan), { persistent: false }, () => {
+			if (stamp !== generation) return;
+			if (planEditTimer) clearTimeout(planEditTimer);
+			planEditTimer = setTimeout(() => {
+				planEditTimer = undefined;
+				if (stamp !== generation || state.mode !== "supervising") return;
+				const snapshot = readPlan();
+				if (snapshot.text === undefined) { ctx.ui.notify(snapshot.error!, "warning"); return; }
+				refresh(ctx);
+				const hash = digest(planViews(snapshot.text).notify);
+				if (hash === planHash) return;
+				planHash = hash;
+				notice = true;
+				send(planChangedReview(state.plan!));
+			}, 150);
+		});
+		planWatcher.on("error", (error) => { planWatcher?.close(); planWatcher = undefined; ctx.ui.notify(`Plan monitoring failed: ${error.message}`, "error"); });
+		} catch (error) { ctx.ui.notify(`Plan monitoring unavailable: ${String(error)}`, "error"); }
 	}
-
-	function updateWidget(ctx: ExtensionContext): void {
-		if (state.phase === "planning") {
-			ctx.ui.setStatus(STATUS_KEY, ctx.ui.theme.fg("warning", "planning"));
-			ctx.ui.setWidget(WIDGET_KEY, ["pi-goals: drafting goals"]);
-			return;
+	function restore(ctx: ExtensionContext) {
+		generation++;
+		state = initial();
+		for (const entry of ctx.sessionManager.getBranch()) {
+			if (entry.type === "custom" && entry.customType === STATE) state = structuredClone(entry.data as State);
 		}
-		const goals = scanGoals(readPlan(ctx));
-		if (goals.length === 0) {
-			ctx.ui.setStatus(STATUS_KEY, undefined);
-			ctx.ui.setWidget(WIDGET_KEY, undefined);
-			return;
+		if (childEnvironment) {
+			state.child = true;
+			state.mode = "solo";
+			// Lineage-only workers attach the explicit task path using AttachGoalPlan.
+			save();
 		}
-		const done = goals.filter((g) => g.status === "done").length;
-		const liveGoals = goals.filter((g) => g.status === "active" || g.status === "open");
-		const stateLabel = liveGoals.length > 0 ? " · supervised" : " · complete";
-		ctx.ui.setStatus(STATUS_KEY, ctx.ui.theme.fg("accent", `◷ ${done}/${goals.length} goals${stateLabel}`));
-		const mark: Record<GoalStatus, string> = { done: "✔", active: "▸", open: "◻", cancelled: "✗" };
-		// Only live goals get lines so finished work never pushes current work off screen. The active
-		// goal also shows its open subtasks: this file is the task list, so the widget is the task list.
-		// No path line: the session id makes it too long to be useful in the widget.
-		const plan = readPlan(ctx);
-		const lines: string[] = liveGoals.length === 0 ? ["✔ complete"] : [];
-		for (const g of liveGoals) {
-			lines.push(`${mark[g.status]} ${g.status === "active" ? "supervising… " : ""}${g.subject}`);
-			if (g.status === "active") lines.push(...openSubtasks(plan, g.line).slice(0, 3).map((s) => ctx.ui.theme.fg("muted", `   ◦ ${s}`)));
-		}
-		ctx.ui.setWidget(WIDGET_KEY, lines);
+		state.helpers ??= []; // sessions persisted before helper bookkeeping
+		notice = true;
+		turnsStale = 0;
+		lastWorkingSet = "";
+		refresh(ctx);
+		watchPlan(ctx);
 	}
-
-	// --- /goals: enter plan mode or configure supervision -- Pi/Codex -----------------------------
-
-	pi.registerCommand("goals", {
-		description: `Plan goals, then open a visible supervisor session. /goals <objective> | clear | model <supervisor>`,
-		handler: async (args, ctx) => {
-			const arg = args.trim();
-			if (arg === "clear") {
-				if (state.planVersion === null) {
-					ctx.ui.notify("No active plan to disconnect.", "info");
-					return;
-				}
-				const currentPlan = planRel(ctx);
-				if (!(await stopSupervisor())) {
-					ctx.ui.notify("Could not close the visible supervisor; the plan remains connected.", "warning");
-					return;
-				}
-				state = { ...state, phase: null, supervisorPaneId: null, approvalId: null, planVersion: null };
-				persist();
-				updateWidget(ctx);
-				ctx.ui.notify(`Disconnected from ${currentPlan}; the file remains on disk.`, "info");
-				return;
-			}
-			if (arg === "model" || arg.startsWith("model ")) {
-				if (state.phase === "working") {
-					ctx.ui.notify("Run /goals clear before changing the active supervisor model.", "warning");
-					return;
-				}
-				if (!(await stopSupervisor())) {
-					ctx.ui.notify("Could not close the visible supervisor; its model was not changed.", "warning");
-					return;
-				}
-				const ref = arg.slice("model".length).trim();
-				state = { ...state, supervisorModel: ref || null, supervisorPaneId: null, approvalId: null };
-				persist();
-				ctx.ui.notify(`Goal-supervisor model ${ref ? `set to ${ref}` : "reset to the current Pi default"}.`, "info");
-				return;
-			}
-			if (!(await stopSupervisor())) {
-				ctx.ui.notify("Could not close the visible supervisor; no new plan was started.", "warning");
-				return;
-			}
-			state = { ...state, phase: "planning", supervisorPaneId: null, approvalId: null, planVersion: nextVersion(ctx) };
-			planningContextPending = true;
-			resyncReason = null;
-			writePlan(ctx, "");
-			persist();
-			updateWidget(ctx);
-			// The drafting rules are sent ONCE, with the seed. v2 re-injected them every turn, which is
-			// why plan mode read as never-ending: every reply re-armed it. They come back only on a
-			// resync (session start / compaction), when the model has genuinely lost them.
-			const seed = arg
-				? `We're in plan mode. Objective: ${arg}\n\n${planDrafting}\n\nWrite the plan to ${planPath(ctx)}.`
-				: `We're in plan mode. Tell me what you want to plan.\n\n${planDrafting}\n\nWrite the plan to ${planPath(ctx)}.`;
-			pi.sendUserMessage(seed, { deliverAs: "followUp" });
-		},
-	});
-
-	// --- hooks --------------------------------------------------------------------------------------
-
-	/** Restore the complete plan once after session start or compaction. */
-	function dueInjection(ctx: ExtensionContext, plan: string): string | null {
-		if (state.phase === "planning" || !plan.trim() || !resyncReason) return null;
-		const why = resyncReason;
-		resyncReason = null;
-		return resync(plan, planRel(ctx), why);
+	function compatible() {
+		const tools = pi.getAllTools();
+		const properties = (name: string) => (tools.find((t) => t.name === name)?.parameters as { properties?: Record<string, unknown> } | undefined)?.properties;
+		return properties("subagent")?.title && properties("subagent")?.agent && properties("subagent_resume")?.sessionFile && properties("subagent_kill")?.id;
 	}
-
-	// The phase snapshot enters context only when planning starts or context was lost.
-	pi.on("before_agent_start", async (_event, ctx) => {
-		if (state.phase === "working") {
-			return {
-				systemPrompt: `${ctx.getSystemPrompt()}\n\nYou are the implementation worker for ${planRel(ctx)}. Keep the full conversation and do the work directly. A stronger read-only supervisor watches this session through pi-supervise and can steer you. Commit clean evidence before asking for sign-off. Stop when a goal appears complete so the supervisor can inspect a settled worker view. Call CompleteGoal only after the supervisor says it recorded approval. -- Pi/Codex`,
-			};
+	function send(content: string, triggerTurn = true) {
+		// sendMessage(triggerTurn:true) bypasses before_agent_start in Pi 0.85.1.
+		// A normal saved prompt prepares the current role before starting the turn.
+		if (triggerTurn) pi.sendUserMessage(`[pi-goals]\n${content}`, { deliverAs: "followUp" });
+		else pi.sendMessage({ customType: "pi-goals-supervision", content, display: true }, { deliverAs: "followUp", triggerTurn: false });
+	}
+	async function confirmOwnership(ctx: ExtensionContext, target: string, text: string, solo = true): Promise<boolean> {
+		if (pendingLaunches > 0) { ctx.ui.notify("A worker launch/resume is still pending; inspect its result before takeover.", "warning"); return false; }
+		const stamp = generation;
+		const revision = workerRevision;
+		const confirmation = solo ? "Worker confirmed stopped" : "Previous supervisor confirmed stopped";
+		const choice = await ctx.ui.select(solo ? "Confirm all other writers for the current and target plans are stopped (inspect /subagents and their panes). A missing handle is not proof. Take over in this session?" : "Confirm no other supervisor owns this plan. Preserve any existing worker session and reconnect rather than starting another writer.", [confirmation, "Cancel"]);
+		if (stamp !== generation || revision !== workerRevision) return false;
+		if (choice !== confirmation) return false;
+		if (readFileSync(target, "utf8") !== text) { ctx.ui.notify("Plan changed during takeover; confirm again.", "warning"); return false; }
+		return true;
+	}
+	function enterSolo(ctx: ExtensionContext) {
+		state.mode = "solo"; state.workerStopped = true;
+		generation++; notice = true; save(); refresh(ctx); watchPlan(ctx);
+		send(`${removeGoalSchedule(ctx.sessionManager.getSessionId())}\n\n${soloNotice(state.plan!)}`);
+	}
+	const help = "/goals new [initial idea] | review | ready | status | stop | resume | solo | exit | attach <plan.md> [solo] | model <model>\n/subagents opens the worker controls. Stop/exit pause this plan locally; worker termination must be confirmed through subagent_kill or its pane. No forced compaction or model switch; the worker pane's own model is chosen with /model in that pane. Hourly check-ins are one session-bound schedule_prompt job; plan-change reviews are the plan-watcher event hook.";
+	async function ready(ctx: ExtensionContext, menu: boolean) {
+		if (state.mode !== "planning") { ctx.ui.notify("Ready applies to a draft; use status or resume.", "warning"); return; }
+		const text = planText();
+		const items = goals(text);
+		if (!items.length || new Set(items.map((g) => key(g.subject))).size !== items.length) {
+			ctx.ui.notify("Write a plan with distinct '- [ ] goal: ...' subjects before Ready.", "warning"); return;
 		}
-		if (!planningContextPending) return;
-		planningContextPending = false;
-		return { message: { customType: PLANNING_CONTEXT, content: planningState(planPath(ctx)), display: false } };
-	});
-
-	// PI: Working turns never see an obsolete planning snapshot. Auto-compaction retries skip
-	// before_agent_start, so context restores the planning snapshot exactly once in that path.
-	pi.on("context", async (event, ctx) => {
-		const messages = state.phase === "planning" ? event.messages : event.messages.filter((message) => (message as { customType?: string }).customType !== PLANNING_CONTEXT);
-		const removedPlanningContext = messages.length !== event.messages.length;
-		if (state.phase === "planning" && planningContextPending) {
-			planningContextPending = false;
-			return { messages: [...messages, { role: "user" as const, content: [{ type: "text" as const, text: planningState(planPath(ctx)) }], timestamp: Date.now() }] };
-		}
-		const text = dueInjection(ctx, readPlan(ctx));
-		if (!text) return removedPlanningContext ? { messages } : undefined;
-		return { messages: [...messages, { role: "user" as const, content: [{ type: "text" as const, text }], timestamp: Date.now() }] };
-	});
-
-	// PI: Human plan-mode replies are durable evidence of the interview, not model summaries.
-	pi.on("input", async (event, ctx) => {
-		if (state.phase === "planning" && event.source !== "extension") writePlan(ctx, appendInterview(readPlan(ctx), event.text));
-	});
-
-	pi.on("turn_end", async (_event, ctx) => {
-		updateWidget(ctx);
-	});
-
-	pi.on("tool_call", async (event, ctx) => {
-		if (state.phase === "planning") {
-			if (PLAN_MODE_BLOCKED_TOOLS.includes(event.toolName)) {
-				const target = (event.input as { path?: string }).path;
-				if (target && resolve(ctx.cwd, target) === resolve(planPath(ctx))) return;
-				return { block: true, reason: `Planning is read-only: only ${planRel(ctx)} may be written. Agree the plan, then choose Ready.` };
-			}
-			if (event.toolName === "bash" && !isPlanningReadOnlyCommand(String((event.input as { command?: string }).command))) {
-				return { block: true, reason: "Planning is read-only: inspect facts without writes or pipes, then put the change in the plan." };
-			}
-			return;
-		}
-	});
-
-	// A compaction loses context, so restore either the planning snapshot or the working plan once.
-	pi.on("session_compact", async () => {
-		if (state.phase === "planning") planningContextPending = true;
-		else resyncReason = "The session was just compacted.";
-	});
-
-	// PI: Print after Pi settles. agent_end is still streaming, so its message queues behind the menu.
-	pi.on("agent_settled", async (_event, ctx) => {
-		if (state.phase !== "planning" || !ctx.hasUI) return;
-		let printed = "";
-		while (true) {
-			const plan = readPlan(ctx);
-			if (scanGoals(plan).length === 0) {
-				if (plan.trim()) ctx.ui.notify(`The plan has no goal line. Revise ${planRel(ctx)} to add one.`, "warning");
-				return;
-			}
-			if (plan !== printed) {
-				printed = plan;
-				pi.sendMessage({ customType: "plan", content: plan, display: true });
-			}
-			const choice = await ctx.ui.select(`Plan drafted in ${planRel(ctx)}.`, ["Ready", "Refine", "Edit", "Cancel"]);
-			if (choice === "Refine") {
-				const notes = await ctx.ui.editor("What should change about the plan?", "");
-				if (!notes?.trim()) continue;
-				writePlan(ctx, appendInterview(plan, notes));
-				planningContextPending = true;
-				pi.sendUserMessage(`Revise the plan at ${planPath(ctx)} using these human notes:\n\n${notes}\n\nKeep the same goal structure.`, { deliverAs: "followUp" });
-				return;
-			}
+		const stamp = generation;
+		if (menu) {
+			const choice = await ctx.ui.select(`Review ${state.plan}`, ["Ready", "Discuss", "Edit", "Cancel"]);
+			if (stamp !== generation || digest(planText()) !== digest(text)) { ctx.ui.notify("Plan changed during review. Review it again.", "warning"); return; }
+			if (choice === "Discuss") { send(discuss); return; }
 			if (choice === "Edit") {
-				const edited = await ctx.ui.editor("Edit the plan", plan);
-				if (edited !== undefined && edited !== plan) writePlan(ctx, edited);
-				continue;
-			}
-			if (choice === "Cancel") {
-				rmSync(planPath(ctx), { force: true });
-				state = { ...state, phase: null, supervisorPaneId: null, approvalId: null, planVersion: null };
-				persist();
-				updateWidget(ctx);
-				ctx.ui.notify("Plan discarded.", "info");
+				const edited = await ctx.ui.editor("Edit goal plan", text);
+				if (edited !== undefined && stamp === generation && planText() === text && state.plan) { writeFileSync(state.plan, edited); refresh(ctx); }
 				return;
 			}
 			if (choice !== "Ready") return;
-			try {
-				await startSupervisor(ctx);
-				state = { ...state, phase: "working" };
-				resyncReason = "The plan was approved.";
-				persist();
-				updateWidget(ctx);
-				ctx.ui.notify(`Visible supervisor opened in Herdr pane ${state.supervisorPaneId}.`, "info");
-				pi.sendUserMessage("The plan is approved. Begin implementation as the worker.");
-			} catch (error) {
-				ctx.ui.notify(`Goal supervisor could not start: ${error instanceof Error ? error.message : String(error)}`, "warning");
-				state = { ...state, phase: "planning", supervisorPaneId: null, approvalId: null };
-				persist();
-				updateWidget(ctx);
-			}
-			return;
+		}
+		if (!compatible()) { ctx.ui.notify("Requires edxeth/pi-subagents 2.9.x, not nicobailon/pi-subagents. Draft preserved; /goals solo is available.", "error"); return; }
+		state.mode = "supervising"; generation++; notice = true; save(); refresh(ctx); watchPlan(ctx);
+		send(`${checkIn(ctx)}\n\n${readyApproved(WORKER, state.plan!, state.worker?.sessionFile, text, ctx.sessionManager.getSessionId())}`);
+	}
+
+	pi.on("session_start", (_e, ctx) => restore(ctx));
+	pi.on("session_tree", (_e, ctx) => restore(ctx));
+	pi.on("session_shutdown", () => { generation++; planWatcher?.close(); planWatcher = undefined; clearTimeout(planEditTimer); planEditTimer = undefined; });
+	pi.on("session_compact", () => { notice = true; });
+	pi.on("turn_end", (_event, ctx) => {
+		if (!["supervising", "solo"].includes(state.mode)) return;
+		const snapshot = readPlan();
+		if (snapshot.text === undefined) { notice = true; return; }
+		const workingSet = foldPlan(snapshot.text);
+		turnsStale = workingSet === lastWorkingSet ? turnsStale + 1 : 0;
+		lastWorkingSet = workingSet;
+		refresh(ctx);
+		if (turnsStale === 8 && goals(snapshot.text).some(g => g.status === "open" || g.status === "active")) {
+			// Pi queues context-only messages until tool results are appended at turn_end.
+			// This reaches the next model call in a long run without triggering another run.
+			pi.sendMessage({ customType: "pi-goals-upkeep", content: upkeep(state.plan!), display: false }, { triggerTurn: false });
 		}
 	});
-
-	pi.on("session_start", async (_event, ctx) => {
-		const last = ctx.sessionManager
-			.getEntries()
-			.filter((e: { type?: string; customType?: string }) => e.type === "custom" && e.customType === STATE)
-			.pop() as { data?: PlanState } | undefined;
-		state = {
-			phase: last?.data?.phase ?? null,
-			supervisorModel: last?.data?.supervisorModel ?? null,
-			supervisorPaneId: last?.data?.supervisorPaneId ?? null,
-			approvalId: last?.data?.approvalId ?? null,
-			planVersion: last?.data?.planVersion ?? null,
-		};
-		planningContextPending = state.phase === "planning";
-		resyncReason = state.phase === "working" ? "New session." : null;
-		updateWidget(ctx);
+	pi.on("agent_end", (_e, ctx) => { refresh(ctx); if (!planWatcher && state.mode === "supervising") watchPlan(ctx); });
+	let proposedDraft = "";
+	let proposing = false;
+	pi.on("agent_settled", async (_e, ctx) => {
+		if (state.child || state.mode !== "planning" || !ctx.hasUI || proposing) return;
+		const text = planText();
+		const version = `${state.plan}:${digest(text)}`;
+		if (!goals(text).length || version === proposedDraft) return;
+		proposedDraft = version;
+		proposing = true;
+		try {
+			pi.sendMessage({ customType: "goal-plan-proposal", content: text, display: true }, { triggerTurn: false });
+			await ready(ctx, true);
+		} finally { proposing = false; }
+	});
+	// No context hook. Historical message arrays, native checkpoints and model selection are untouched.
+	pi.on("before_agent_start", (event, ctx) => {
+		if (state.mode === "chat") return;
+		const snapshot = readPlan();
+		if (snapshot.text === undefined) {
+			notice = true; // Retry resync on the next turn; do not consume a failed snapshot.
+			return { systemPrompt: `${event.systemPrompt}\n\n${state.child ? childPlanRole : ""}\n${snapshot.error}` };
+		}
+		const role = state.child ? childPlanRole : state.mode === "supervising"
+			? supervisor(WORKER, state.plan!, ctx.sessionManager.getSessionId())
+			: state.mode === "planning" ? planning(state.plan!) : state.mode === "paused" ? pausedRole : soloRole;
+		const content = notice ? planContext(state.child ? "worker" : state.mode, state.plan, snapshot.text)
+			: undefined;
+		if (content) turnsStale = 0;
+		notice = false;
+		return { systemPrompt: `${event.systemPrompt}\n\n${role}`, ...(content ? { message: { customType: "pi-goals-plan", content, display: false } } : {}) };
+	});
+	pi.on("tool_call", (event) => {
+		if (state.child || !["subagent", "subagent_resume"].includes(event.toolName)) return;
+		// Solo means this chat took over implementation: no concurrent writer may be delegated.
+		if (state.mode === "planning" || state.mode === "paused" || state.mode === "solo") return { block: true, reason: goalToolBlocked(state.mode) };
+		if (state.plan) { pendingLaunches++; state.workerStopped = false; workerRevision++; save(); }
+	});
+	pi.on("tool_result", (event) => {
+		if (state.child || !state.plan || !["subagent", "subagent_resume"].includes(event.toolName)) return;
+		pendingLaunches = Math.max(0, pendingLaunches - 1);
+		if (event.isError) return;
+		const details = event.details as { id?: string; sessionFile?: string } | undefined;
+		if (!details?.id || !details.sessionFile) return;
+		const record = { id: details.id, sessionFile: details.sessionFile };
+		if (state.worker?.sessionFile === record.sessionFile) state.worker = record;
+		else if (!state.worker) state.worker = record;
+		// Extra launches stay recorded as helpers; the implementation binding never moves silently.
+		else state.helpers = [...(state.helpers ?? []).filter((h) => h.sessionFile !== record.sessionFile), record];
+		state.workerStopped = false; workerRevision++; save();
 	});
 
-	pi.registerTool({
-		name: "CompleteGoal",
-		label: "Goal signoff",
-		description: completeGoalDescription,
-		parameters: Type.Object({
-			goal: Type.String({ description: completeGoalParamDescription }),
-		}),
-		async execute(_id, params, _signal, _onUpdate, ctx) {
-			if (state.phase !== "working") return result("Planning is not approved. Choose Ready before signing off a goal.", true);
-			if (!state.approvalId) return result("Goal sign-off blocked: no current supervisor review.", true);
-			const plan = readPlan(ctx);
-			if (!plan.trim()) return result(`No plan file at ${planRel(ctx)}. Run /goals to draft one.`, true);
-			const block = goalBlock(plan, params.goal);
-			if (!block) return result(`No unique open goal line matched "${params.goal}" in ${planRel(ctx)}.`, true);
-			let repository: ReturnType<typeof repositoryState>;
+	pi.registerCommand("goals", {
+		description: "Goal plan actions: new, review, ready, status, stop, resume, solo, attach, model, exit",
+		getArgumentCompletions: (prefix) => ["new", "review", "ready", "status", "stop", "resume", "solo", "attach", "model", "exit", "help"].filter((verb) => verb.startsWith(prefix)).map((verb) => ({ value: verb, label: verb })),
+		handler: async (args, ctx) => {
 			try {
-				repository = repositoryState(ctx.cwd);
-			} catch (error) {
-				return result(`Goal sign-off could not inspect the repository: ${error instanceof Error ? error.message : String(error)}`, true);
-			}
-			if (!repository.cleanWorktree) return result("Goal sign-off blocked: worktree is dirty.", true);
-			const approval = readApproval(approvalPath(ctx.cwd, ctx.sessionManager.getSessionId(), params.goal));
-			if (!approvalMatches(approval, {
-				approvalId: state.approvalId,
-				goal: params.goal,
-				planPath: planPath(ctx),
-				goalBlockHash: hashGoalBlock(block),
-				repoRoot: repository.repoRoot,
-				head: repository.head,
-				tree: repository.tree,
-				cleanWorktree: repository.cleanWorktree,
-			})) return result("Goal sign-off blocked: no matching supervisor approval checkpoint. Request a fresh supervisor review.", true);
-			const ticked = tickGoal(plan, params.goal);
-			if (!ticked) return result(`No unique exact goal line matched "${params.goal}" in ${planRel(ctx)}.`, true);
-			writePlan(ctx, appendLog(ticked, `${stamp()} mechanically signed off "${params.goal}" after matching supervisor approval`));
-			updateWidget(ctx);
-			return result(`Sign-off accepted. Goal ticked [x] in ${planRel(ctx)}.`);
+				if (state.child) { ctx.ui.notify("This is the delegated worker. Goal approval belongs to its parent.", "info"); return; }
+				let command = args.trim();
+				if (!command) {
+					const actions = ["status — Show current plan", "new — New plan", "attach — Open an existing plan", "review — Review current plan", "ready — Approve draft", "stop — Pause work", "resume — Continue paused work", "solo — Work in this session", "model — Set worker model", "exit — Leave goal mode", "help — Show commands"];
+					const before = generation;
+					const choice = await ctx.ui.select("Goal plan actions", actions);
+					if (!choice || before !== generation) return;
+					command = choice.split(" — ")[0];
+					if (["attach", "model"].includes(command)) {
+						const value = await ctx.ui.editor(command === "attach" ? "Plan path (optional: solo)" : "Worker model (provider/model)", "");
+						if (!value?.trim() || before !== generation) return;
+						command += ` ${value.trim()}`;
+					}
+				}
+				if (command === "help") { ctx.ui.notify(help, "info"); return; }
+				if (command === "status") {
+					refresh(ctx);
+					ctx.ui.notify([
+						`Mode: ${state.mode}`,
+						`Plan: ${state.plan ?? "none"}`,
+						`Preferred worker model (plan): ${notedPlanValue("preferred worker model") ?? "not stated; use /goals model <model>"}`,
+						`Recorded worker session: ${state.worker?.sessionFile ?? "not recorded"}`,
+						`Helper subagent sessions: ${state.helpers.length} recorded (liveness via /subagents)`,
+						notedPlanValue("worker session") ? `Worker session noted in plan: ${notedPlanValue("worker session")}` : "",
+						`Hourly check-in: schedule_prompt job ${JSON.stringify(`goals-${ctx.sessionManager.getSessionId()}`)} (list/remove via schedule_prompt; plan-change reviews are the plan-watcher event hook)`,
+						"Liveness is owned by edxeth; inspect /subagents.",
+					].filter(Boolean).join("\n"), "info");
+					return;
+				}
+				if (command === "review" && state.mode === "supervising") { notice = true; send(manualReview(state.plan ?? "")); return; }
+				if (command === "review" || command === "ready") { await ready(ctx, command === "review"); return; }
+				if (command === "model" || command.startsWith("model ")) {
+					if (!state.plan || !goals(planText()).length) { ctx.ui.notify("Register a goal plan first.", "warning"); return; }
+					const ref = command.slice("model".length).trim();
+					if (!ref) { ctx.ui.notify("Use /goals model <provider/model>; no preference changed.", "info"); return; }
+					const lines = planText().split("\n");
+					const pref = `- preferred worker model: ${ref || "(none specified)"}`;
+					const found = lines.findIndex((line) => /^-\s*preferred worker model:/i.test(line));
+					if (found >= 0) lines[found] = pref;
+					else { const title = lines.findIndex((line) => /^#\s/.test(line)); lines.splice(title >= 0 ? title + 1 : 0, 0, pref); }
+					writeFileSync(state.plan, lines.join("\n"));
+					planHash = digest(planViews(planText()).notify);
+					refresh(ctx);
+					ctx.ui.notify(ref ? `Preferred worker model set to ${ref} in plan preferences. The supervisor selects it at launch and verifies the resolved model; the worker pane's own model is chosen with /model in that pane.` : "Preferred worker model cleared.", "info");
+					return;
+				}
+				if (command === "attach" || command.startsWith("attach ")) {
+					const rest = command.slice("attach".length).trim();
+					const [raw, kind, extra] = rest.split(/\s+/);
+					const solo = kind === "solo";
+					if (extra || (kind && !solo)) { ctx.ui.notify("Use /goals attach <path-to-plan.md> [solo].", "warning"); return; }
+					if (!raw) { ctx.ui.notify("Use /goals attach <path-to-plan.md> [solo].", "info"); return; }
+					const target = isAbsolute(raw) ? raw : resolve(ctx.cwd, raw);
+					let text: string;
+					try { text = readFileSync(target, "utf8"); } catch { ctx.ui.notify(`Cannot read plan at ${target}.`, "error"); return; }
+					if (!goals(text).length) { ctx.ui.notify(`${target} has no '- [ ] goal:' lines; attach a judgeable plan.`, "warning"); return; }
+					if (!solo && ((state.worker && !state.workerStopped) || state.mode === "supervising")) { ctx.ui.notify("Exit and resolve the existing worker before replacing the plan. The current plan is preserved.", "warning"); return; }
+					const noted = /^-\s*worker session:\s*(\S+)/im.exec(foldPlan(text))?.[1];
+					if (!(await confirmOwnership(ctx, target, text, solo))) return;
+					const retained = target === state.plan ? state.signoffs : {};
+					const worker = noted ? { sessionFile: resolve(ctx.cwd, noted) } : state.workerStopped ? state.worker : undefined;
+					state = { mode: solo ? "solo" : "planning", plan: target, signoffs: retained, worker, helpers: [], workerStopped: solo || (!noted && state.workerStopped) };
+					generation++; notice = true; save(); refresh(ctx); watchPlan(ctx);
+					if (solo) enterSolo(ctx);
+					else send(attachNotice(target, false, noted));
+					return;
+				}
+				if (command === "stop" || command === "exit") {
+					if (state.mode === "planning") {
+						if (command === "stop") { ctx.ui.notify("A draft cannot pause; use /goals exit to leave planning with the draft preserved.", "warning"); return; }
+						// Planning exit must not get the model trapped re-planning or lose the draft.
+						state.mode = "chat"; generation++; notice = true; save(); refresh(ctx); watchPlan(ctx);
+						ctx.ui.notify(`Planning exited; draft preserved at ${state.plan}. No implementation was approved or started. Reconnect with /goals attach ${state.plan}.`, "info");
+						return;
+					}
+					state.mode = command === "stop" ? "paused" : "chat"; generation++; notice = true; save(); refresh(ctx); watchPlan(ctx);
+					send(`${removeGoalSchedule(ctx.sessionManager.getSessionId())}\n\n${pauseExitNotice(state.worker, command === "exit")}`, Boolean(state.worker) || hasScheduleTool());
+					return;
+				}
+				if (command === "resume") {
+					if (state.mode !== "paused" || !state.plan) { ctx.ui.notify("Only a paused approved plan can resume. A draft needs Ready.", "warning"); return; }
+					if (!compatible()) { ctx.ui.notify("edxeth tools unavailable; plan remains paused.", "error"); return; }
+					state.mode = "supervising"; generation++; notice = true; save(); refresh(ctx); watchPlan(ctx);
+					send(`${checkIn(ctx)}\n\n${resumeNotice(WORKER, state.plan, state.worker)}`);
+					return;
+				}
+				if (command === "solo") {
+					if (!state.plan || !goals(planText()).length) { ctx.ui.notify("Register a goal plan first.", "warning"); return; }
+					if (!(await confirmOwnership(ctx, state.plan, planText()))) return;
+					enterSolo(ctx);
+					return;
+				}
+				if (command !== "new" && !command.startsWith("new ")) { ctx.ui.notify(`Unknown or incomplete command. ${help}`, "warning"); return; }
+				const objective = command.slice(4).trim();
+				if ((state.worker && !state.workerStopped) || state.mode === "supervising") { ctx.ui.notify("Exit and resolve the existing worker before replacing the plan. The current plan is preserved.", "warning"); return; }
+				const path = join(ctx.cwd, ".pi", "plan", `${ctx.sessionManager.getSessionId()}-main.md`);
+				mkdirSync(dirname(path), { recursive: true });
+				// Never overwrite an earlier plan at this session path; the model can revise it after inspection.
+				try { writeFileSync(path, planDocument(objective), { flag: "wx" }); } catch (error) { if ((error as NodeJS.ErrnoException).code !== "EEXIST") throw error; }
+				state = { mode: "planning", plan: path, signoffs: {}, worker: state.worker, helpers: state.helpers, workerStopped: state.workerStopped }; generation++; notice = true; save(); refresh(ctx); watchPlan(ctx);
+				send(planningSeed(objective, path));
+			} catch (error) { ctx.ui.notify(String(error), "error"); }
+		},
+	});
+	pi.registerTool({
+		name: "AttachGoalPlan", label: "Attach delegated plan", description: attachGoalPlanDescription,
+		parameters: Type.Object({ path: Type.String() }),
+		async execute(_id, params, _signal, _update, ctx) {
+			if (!state.child) return result(messages.childAttachOnly);
+			try {
+				if (!isAbsolute(params.path) || !goals(readFileSync(params.path, "utf8")).length) return result(messages.invalidAttachment);
+			} catch { return result(messages.invalidAttachment); }
+			state.plan = params.path; generation++; notice = true; save(); refresh(ctx);
+			return result(childPlanAttached(params.path));
+		},
+	});
+	pi.registerTool({
+		name: "CompleteGoal", label: "Review goal evidence",
+		description: completeGoalDescription,
+		parameters: Type.Object({ goal: Type.String(), evidence: Type.Array(Type.String(), { minItems: 1 }), observation: Type.String({ minLength: 1 }) }),
+		async execute(_id, params, signal, _update, ctx) {
+			if (state.child || !["supervising", "solo"].includes(state.mode)) return result(messages.completionUnavailable);
+			if (signal?.aborted) return result(messages.cancelled);
+			const snapshot = readPlan();
+			if (snapshot.text === undefined) return result(snapshot.error!);
+			const text = snapshot.text;
+			const matches = goals(text).filter((g) => g.status !== "cancelled" && key(g.subject) === key(params.goal));
+			if (matches.length !== 1 || !state.plan) return result(messages.uniqueGoal);
+			const evidence = params.evidence.map((file) => isAbsolute(file) ? file : resolve(ctx.cwd, file));
+			try { for (const file of evidence) if (!readFileSync(file).length) throw new Error(emptyEvidence(file)); }
+			catch (error) { return result(evidenceUnavailable(error)); }
+			const lines = text.split("\n");
+			lines[matches[0].index] = lines[matches[0].index].replace(/\[[ xX/-]\]/, "[x]");
+			let log = lines.findIndex(line => /^##\s+Log\s*$/i.test(line));
+			if (log === -1) { lines.push("", "## Log"); log = lines.length - 1; }
+			lines.splice(log + 1, 0, "", completionLog(params.goal, params.observation, evidence, state.mode === "solo"));
+			writeFileSync(state.plan, `${lines.join("\n").trimEnd()}\n`);
+			state.signoffs[key(matches[0].subject)] = { evidence, observation: params.observation };
+			planHash = digest(planViews(planText()).notify);
+			save(); refresh(ctx);
+			const remaining = goals(planText()).some((goal) => goal.status !== "cancelled" && (goal.status !== "done" || !state.signoffs[key(goal.subject)]));
+			return result(completionResult(matches[0].subject, ctx.sessionManager.getSessionId(), remaining, state.mode === "solo"));
 		},
 	});
 }
-
-// --- helpers (module scope) --------------------------------------------------------------------
-
-function result(text: string, isError = false) {
-	return { content: [{ type: "text" as const, text }], details: {}, isError };
-}
-
-function mutatingReadCommand(part: string): boolean {
-	return /(?:^|\s)--output(?:=|\s|$)|^find\b.*\s-(?:delete|exec|execdir|ok|okdir|fprint|fprintf|fls)(?:\s|$)/.test(part)
-		|| (/^git\s+branch\b/.test(part) && !/^git\s+branch(?:\s+(?:--show-current|--list|-a|--all|-r|--remotes|-v|-vv))*$/.test(part));
-}
-
-function isPlanningReadOnlyCommand(command: string): boolean {
-	if (/[|><`$\n\r]/.test(command)) return false;
-	return command.split(/&&|;/).every((raw) => {
-		const part = raw.trim();
-		return !mutatingReadCommand(part) && /^(?:cd\b|pwd|ls\b|git\s+(?:status|log|diff|show|branch)\b|rg\b|grep\b|find\b|head\b|tail\b|wc\b|stat\b|test\b)\b/.test(part);
-	});
-}
-
-
-/** Local time, not UTC: agents freehand-stamp their manual ## Log lines from the local clock they
- *  see, so a UTC tool stamp made the trail read as two different afternoons (dogfood finding). */
-function stamp(): string {
-	const d = new Date();
-	const p = (n: number) => String(n).padStart(2, "0");
-	return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}`;
-}
-
-/** Tick the goal line whose subject exactly matches `goal` (trimmed, case-insensitive) to [x].
- *  Null when there is no unique exact match. Reuses GOAL_LINE and is deliberately not fuzzy. */
-export function tickGoal(plan: string, goal: string): string | null {
-	const lines = plan.split("\n");
-	const want = goal.trim().toLowerCase();
-	const hits = lines.flatMap((l, i) => (GOAL_LINE.exec(l)?.[2].trim().toLowerCase() === want ? [i] : []));
-	if (hits.length !== 1) return null;
-	lines[hits[0]] = lines[hits[0]].replace(/\[[ xX/-]\]/, "[x]");
-	return lines.join("\n");
-}
-
-/** Append one line under ## Log (creating the section at EOF if absent). */
-export function appendLog(text: string, entry: string): string {
-	const lines = text.split("\n");
-	const line = `- ${entry}`;
-	const header = lines.findIndex((l) => /^##\s+Log\s*$/i.test(l));
-	if (header === -1) return `${text.replace(/\n+$/, "")}\n\n## Log\n${line}\n`;
-	let insertAt = header + 1;
-	for (let i = header + 1; i < lines.length; i++) {
-		if (/^#{1,6}\s/.test(lines[i])) break;
-		if (/^\s*-\s+/.test(lines[i])) insertAt = i + 1;
-	}
-	lines.splice(insertAt, 0, line);
-	return lines.join("\n");
-}
-
-/** PI: Preserve human plan-mode answers verbatim below the fold. */
-export function appendInterview(text: string, answer: string): string {
-	const lines = text.split("\n");
-	const header = lines.findIndex((l) => /^##\s+Interview\s*$/i.test(l));
-	const entry = [`### ${stamp()}`, "", ...answer.split("\n").map((line) => `> ${line}`), ""];
-	if (header === -1) return `${text.replace(/\n+$/, "")}\n\n## Interview\n\n${entry.join("\n")}`;
-	let insertAt = header + 1;
-	while (insertAt < lines.length && !/^##\s+/.test(lines[insertAt])) insertAt++;
-	lines.splice(insertAt, 0, ...entry);
-	return lines.join("\n");
-}

src/plan-view.ts

@@ -0,0 +1,33 @@
+// Pi/OpenAI: Preserve plan wording; omit history and, in the short view, task/evidence details.
+// The notify view governs plan-change events: goals, tasks, evidence and inferences are
+// content worth a supervisor review; worker identity bookkeeping is not (field report,
+// LUCID3 supervisor 2026-09-10: two identical review events for a session-path edit).
+export function planViews(plan: string): { short: string; notify: string; long: string } {
+	const long = plan.split(/^#{1,6}\s+(?:Log|Appendix|Appendices|Appendixes|Interview|Learnings|Papercuts)\b.*$/mi)[0].trim();
+	const identity = /^-\s*(?:active worker|worker session|worker intercom session):/i;
+	const notify = long.split("\n").filter((line) => !identity.test(line)).join("\n").trim();
+	const kept: string[] = [];
+	let omittedIndent: number | null = null;
+	let omittedHeading: number | null = null;
+	for (const line of long.split("\n")) {
+		// Pi/OpenAI: Worker identity bookkeeping is not a change to agreed requirements.
+		if (/^-\s*(?:active worker|worker session|worker intercom session):/i.test(line)) continue;
+		const heading = /^(#{1,6})\s+(.+)$/.exec(line);
+		if (heading) {
+			if (omittedHeading !== null && heading[1].length <= omittedHeading) omittedHeading = null;
+			if (/^(?:Tasks?|Task list|Subtasks?|Evidence)\b/i.test(heading[2])) omittedHeading = heading[1].length;
+		}
+		if (omittedHeading !== null) continue;
+		const indent = line.match(/^\s*/)?.[0].length ?? 0;
+		if (omittedIndent !== null) {
+			if (!line.trim() || indent > omittedIndent) continue;
+			omittedIndent = null;
+		}
+		if (/^\s*[-*]\s+(?:tasks?|subtasks?|evidence):/i.test(line) || /^\s*(?:\d+[.)]|[-*])\s+\[[ x/~-]\]\s+(?!goal:)/i.test(line)) {
+			omittedIndent = indent;
+			continue;
+		}
+		kept.push(line);
+	}
+	return { short: kept.join("\n").trim(), notify, long };
+}

src/plan.ts

@@ -0,0 +1,8 @@
+// Shared plan syntax: only the section above the Log contains current goals.
+export const GOAL_LINE = /^\s*(?:\d+\.|[-*])\s*\[([ xX/-])\]\s*goal:\s*(.*)$/i;
+export const FOLD_LINE = /^##\s+Log\s*$/im;
+
+export function foldPlan(plan: string): string {
+	const match = FOLD_LINE.exec(plan);
+	return (match ? plan.slice(0, match.index) : plan).trimEnd();
+}

src/prompts.ts

@@ -1,45 +1,29 @@
-/**
- * pi-goals v2 — all model-facing text, in flow order.
- *
- * Design: the plan file is for LLMs and the human, not for TypeScript. No parser and no schema;
- * the skeleton below is a convention the drafting prompt teaches. The main session implements it,
- * while a visible forked Pi session supervises through pi-supervise.
- *
- * THE FOLD: everything above "## Log" is the short current-goal section. Everything below it
- * (Log, Learnings, Appendix) is durable memory: unlimited, read on demand, and sent in full at
- * session start and after compaction.
- *
- * Flow:
- *   SETUP (plan mode)     1. planDrafting   — draft goals into the plan file (read-only), sent once
- *   EXEC, after compact   2. resync         — the WHOLE file back, once
- *   SIGN-OFF, worker-side 3. completeGoal*  — the one blessed tool's description
- *   SUPERVISION            supervisor-session.ts — visible read-only supervisor
- *
- * The goal's test is the DISCRIMINATOR: the concrete observation that tells real success from the
- * named subtle failure mode. Evidence is empty at planning and filled at sign-off.
- */
-
-/* ─────────────────────────────────────────────────────────────────────────
- * 1. planDrafting — SETUP, plan mode (read-only: edit/write blocked except the plan file)
- * ──────────────────────────────────────────────────────────────────────── */
+// Pi/OpenAI: Planning, approval, supervision, reminders, completion and recovery.
 export const planDrafting = `\
-You are in plan mode. You are making a short judgeable plan that captures the user's real goals, then tests it in conversation.
+You are in plan mode. Help the user express what they want this project to achieve in a short judgeable plan. Seek to understand their underlying goals, infer ordinary details, and use their applicable AGENTS.md instructions, relevant skills, and project context to interpret the request correctly. Do not silently substitute your own goals or expand the agreed scope.
 
 1. Reduce technical uncertainty first. Use read-only repository tools or web search when either can
 resolve a fact. Do not write or run code in this phase (edit/write are blocked except for the plan
 file; don't mutate state via bash either).
 2. Before you draft a goal, identify its object, observable result, scope, and any decision that the
-human would need to approve later. Ask at least three short, concrete questions that test whether you
-understand the requested outcome, boundary, and how success will be judged. Inspect files or search the
-web before asking when either can answer a fact. If the human does not answer a question, record that
-point as unknown; do not silently replace it with an inference. Do not present the review menu with a
-placeholder goal such as "work out the thing", "improve it", or "investigate".
-3. For independent high-impact questions, build a decision tree and ask the whole frontier in one
-round. Ask only questions worth the human's time, where the answer materially reduces uncertainty
+human would need to approve later. Briefly reframe the request in your own words to check comprehension
+and make your understanding visible: the intended outcome, boundary, and success check. Invite correction,
+but do not require confirmation when these are already clear. Ask questions that expose differences
+between your understanding and the user's that would otherwise stay hidden. Probe consequential
+assumptions, challenge inconsistencies, and follow up where an answer exposes a gap. Do not use a question quota or ask the human
+to approve ordinary implementation details. Inspect files or search the web before asking when either
+can answer a fact. If the human does not answer a question, record that
+point as unknown; do not silently replace it with an inference or turn it into a new blocking decision.
+Do not present the review menu with a placeholder goal such as "work out the thing", "improve it", or
+"investigate".
+3. Use questions to clarify and narrow the goal, test your assumptions, and bring your understanding
+into agreement with the user's. Respect their limited time: batch independent high-impact questions
+in one short round, where the answer materially reduces uncertainty
 while discovering the right plan. Each question must be short and self-contained: state the relevant
 context, use the human's language and ASD-STE100
 Simple Technical English, and give a recommended answer. Record each answer, or the unanswered
-unknown, in ## Interview. Do not make the plan final while material user decisions remain open.
+unknown, in ## Interview. Draft goals and present Ready when the requested work is otherwise executable.
+Only withhold Ready for an unanswered choice that changes scope, spending, or the user-visible result.
 4. State the user-visible result before the goals: one concrete sentence naming what the human will
 inspect when this plan is done. Take it from the original request, not from your implementation plan.
 Every requested artifact and action must survive into this sentence. An agent-inferred constraint may
@@ -139,52 +123,93 @@ Conventions:
 
 When the goals are drafted, present them and say the plan is final. Do not begin execution.`;
 
-export function planningState(planPath: string): string {
-	return `\
-[PLANNING MODE]
-The plan at ${planPath} is the only file you may change. Use read-only repository tools or web search
-when either can resolve a fact. Ask the human to confirm unresolved interpretation, outcome, task,
-scope, or a choice that needs their approval. Batch independent high-impact questions in one short,
-self-contained round with relevant context and a recommendation. Do not draft a placeholder goal
-without a concrete object, observable result, settled scope, and required approval. Do not execute
-work, mark a goal [/] or [x], or sign off a goal. The plan is not approved until the human selects
-Ready.`;
+// Planning and interview. Keep the full drafting guide one-shot rather than repeating it each turn.
+export function planning(planPath: string): string {
+	return `Plan only in ${planPath}; do not implement or launch workers before Ready. Ask material unresolved questions, not a quota or confirmation of ordinary details. Record unknowns and present Ready when the outcome, scope and spending are settled. Preserve the user's exact deliverable, preferences and voice; give each distinct goal a failure mode, discriminator and evidence expectation above ## Log. Record the requested worker model in preferences. When your drafted plan is ready for human review, finish your turn; the interface displays the draft and approval choices automatically. Do not ask the user to type a command to see the proposal. /goals review reopens it on request; /goals exit preserves the draft.`;
+}
+export function planningSeed(objective: string, planPath: string): string {
+	return `Enter a planning conversation focused on the user's goals. ${objective ? `Initial idea: ${objective}.` : "Ask what the user wants to achieve; they do not need to supply a finished objective."} Read any existing plan at ${planPath} first, then discuss and draft it with the user. Do not infer approval to implement from starting this conversation. ${planning(planPath)}\n\n${planDrafting}`;
+}
+export const planDocument = (objective: string) => `# Goal plan\n\n## Objective\n${objective}\n\n## Goals\n\n## Log\n`;
+export const discuss = "Discuss the current draft in ordinary chat. Do not launch a worker or reopen the review menu until requested.";
+
+// Ready and explicit child attachment: stock lineage-only sessions do not inherit the shared plan.
+export const attachGoalPlanDescription = "Delegated goals-worker only: attach the absolute plan path explicitly supplied in your task. Read it without rewriting it. Restores the worker widget and plan context; grants no parent completion authority. No discovery or worker launch.";
+export const childPlanRole = "You are the delegated implementation worker. Maintain task ticks, evidence and Log entries for your delegated work in the supplied plan. Preserve agreed goals, requirements and discriminators; the supervisor owns goal-status changes and completion approval. Do not launch a second writer. Call AttachGoalPlan with the explicit plan path in your task before implementation (also after reconnect if unbound). Immediately report your actual Intercom UUID, saved-session path and current provider/model to the supplied supervisor ID. Identify unavailable fields as unknown; do not equate runtime IDs, session filenames and Intercom IDs. Send progress, completion and blocker reports there with artifact paths, then stay open for live messages. Do not exit or use caller_ping; unsent editor drafts are not visible in model context.";
+export function readyApproved(workerName: string, planPath: string, notedWorker: string | undefined, plan: string, supervisorId: string): string {
+	const launch = notedWorker
+		? `Inspect the recorded worker session ${notedWorker}; if still live, let it continue or message it. Only after confirming it stopped use subagent_resume with that sessionFile. Never restart completed work.`
+		: `Delegate the first unfinished goal to agent '${workerName}' with subagent; provide name, title and a bounded task.`;
+	return `Ready approved this plan: ${planPath}. Stay here as supervisor. ${launch} Include the absolute plan path, require AttachGoalPlan, and give the child supervisor Intercom session ${supervisorId}. The child sends its completion report there and stays open. Require an initial worker report with its actual Intercom UUID, saved-session path and current provider/model; the async launch may return only a runtime ID. Record each distinct identity in plan preferences, marking child-reported fields as such until verified. Do not start a second writer. Inspect actual outputs when the child reports.\n\n${plan}`;
 }
 
-/* ─────────────────────────────────────────────────────────────────────────
- * 2. resync — EXEC, one-shot at session start and after a compaction: the WHOLE file back,
- *     appendix included. Modelled on pi-goal-x's [POST-COMPACTION RESYNC] one-shot. This is the
- *     only place the below-the-fold sections are pushed; otherwise the agent reads them on demand.
- * ──────────────────────────────────────────────────────────────────────── */
-export function resync(plan: string, planRel: string, why: string): string {
-	return `\
-<system-reminder>
-${why} This is the whole plan file (${planRel}), appendix included. You are the implementation worker.
-Keep the high-level goal and human intent stable and do the work directly. A visible read-only Pi
-session supervises you through pi-supervise. The human's latest message outranks the plan: if it
-changes scope, amend the plan rather than preserving an obsolete decision.
-
-${plan}
-</system-reminder>`;
+// Supervision and turn-event upkeep (not a scheduled wake-up).
+const supervisorJob = "Your job is to be an autonomous research partner and supervisor with responsibility for the user's goals. Keep perspective, bring diligence, and use research taste and wisdom to sustain work overnight and keep it on track. Resolve routine implementation decisions yourself; ask the user only when their judgment or authorization is needed.";
+export function supervisor(workerName: string, planPath: string, supervisorId: string): string {
+	return `You are the goal supervisor in the main chat for ${planPath}. ${supervisorJob} Inspect actual artifacts, saved verification, applicable AGENTS.md and skills yourself; delegate implementation to '${workerName}'. Keep authorized work moving to the requested outcome, not merely approval paperwork. Investigate blocked/waiting/done claims and change ineffective instructions. Give brief visible assessments with judgment. You may maintain the plan but must not weaken the goal to accept worker output.
+You can be playful: a kaomoji, meme, discovery celebration or frustration when it fits. No forced cheerfulness. If supervision gets repetitive, step back, reflect with humor and change your approach. Keep it brief and aimed at the goal, not another reporting chore.
+You can speculate and brainstorm around uncertainty or unexpected results. Label guesses as guesses, consider alternative explanations, and look for a useful way to tell them apart. Keep exploration brief, open-minded and fun: take a step back, play with surprising ideas, question the current framing, and enjoy exploring the broader perspective while staying connected to the agreed goal.
+(b •_•)b -- wassname
+Take uncertainty as an invitation to investigate, not something to hide. Have room to play with ideas, question yourself and the worker, and appreciate a good surprise. Investigate surprising results, find mistaken assumptions, make complicated ideas simpler, and disagree usefully rather than agree politely. Keep the work moving without turning supervision into paperwork. A little affectionate teasing is welcome when it fits—“cheeky subagent, where’s the baseline?”—and workers can push back too. Keep the humor friendly and the criticism specific. -- Pi/Astra
+Use stock subagent for launch and subagent_resume with the returned sessionFile only after confirming the worker stopped. A stored handle is not proof of liveness; missing runtime state is not proof it stopped. Use pi-intercom list/status to identify the actual live child session before live steering; receipt alone does not prove action. Give each worker your Intercom session ID ${supervisorId}; require its completion report through Intercom while its pane stays open. A recap alone sends no instruction. Record '- worker session:' and '- worker intercom session:' in plan preferences from actual launch results and received-message identity; never confuse the runtime ID with the Intercom ID. Ensure the child calls AttachGoalPlan with the supplied path. Inspect results before CompleteGoal, then continue only unfinished goals.
+Use the worker model requested in plan preferences, verify the resolved model, and report unavailable choices instead of silently substituting. Keep normal tools, not edxeth's restricted orchestrator mode. After reload or compaction reread the plan. Failed compaction, exhausted credits or lost connection do not erase progress: diagnose the actual error, restore an available authorized model/credits and resume the same saved session; never restart long work. Stock edxeth can crash the parent when a worker exits after parent reload: preserve drafts and stop workers before /reload. If it already happened, restart the saved parent session; do not repeat completed work.`;
+}
+export function upkeep(planPath: string): string {
+	return `Plan upkeep: update task ticks, evidence and Log in ${planPath} when you have new progress to record. Preserve agreed goals and discriminators. If already reviewing evidence, finish that review rather than repeat a status recap. This turn-event reminder does not resume paused work.`;
+}
+export function planContext(mode: string, path: string | undefined, text: string): string {
+	return `Current goal mode: ${mode}. Earlier role messages are historical; this current role governs.\nPlan: ${path ?? "not attached"}\n${text}`;
+}
+export function planChangedReview(planPath: string): string {
+	return `${supervisorJob}\nPlan changed: ${planPath}. Read the current working set and inspect changed requirements, completion claims and evidence. Manual checkbox edits are claims, not proof. Do not weaken the agreed goal or start a duplicate writer.`;
+}
+export function manualReview(planPath: string): string {
+	return `${supervisorJob}\nReview the current plan ${planPath}, worker progress and actual evidence. Do not launch a duplicate writer.`;
 }
 
-/* ─────────────────────────────────────────────────────────────────────────
- * 3. completeGoal — SIGN-OFF, agent-side: the one blessed tool
- * ──────────────────────────────────────────────────────────────────────── */
-export const completeGoalDescription =
-	"Sign off a goal once its discriminator is satisfied. First fill the goal's evidence: list in the " +
-	"plan file: each item pairs a durable artifact with a short read of it (a quoted+linked log, a " +
-	"table plus how to read it, a metric plus what it shows -- not a bare claim). Quote verbatim from " +
-	"output you actually observed; never reconstruct numbers from memory. If you couldn't see an " +
-	"output, rerun it or write that you couldn't -- an honest gap beats a plausible fabrication. If " +
-	"the goal names a verify: command, direct the worker to run it and save its output to a file cited " +
-	"in the evidence. The supervisor may run an allowed read-only verification command, but must not " +
-	"create the evidence file itself. The visible supervisor must reject a claimed pass with no saved " +
-	"output. The read must show success POSITIVELY happened, not just that failures were avoided. The " +
-	"supervisor records an approval checkpoint only after it inspected the current plan, repository, " +
-	"evidence, verify output, and a stopped worker view with no active work. Then the worker calls this " +
-	"tool with the exact goal text. This tool independently checks that checkpoint " +
-	"against the exact current goal block, HEAD/tree, and clean worktree before it appends the sign-off to " +
-	"## Log and ticks the goal [x]. If any check differs, it fails closed and requires a fresh supervisor review.";
+// Check-ins. The installed scheduler owns storage/timing/UI. Removal guidance must never add jobs.
+export function removeGoalSchedule(sessionId: string): string {
+	return `With schedule_prompt, list jobs and read .pi/schedule-prompts.json to verify ownership; tool text omits session binding. Remove by jobId only the job named ${JSON.stringify(`goals-${sessionId}`)} bound to session ${JSON.stringify(sessionId)}. Never use cleanup; leave other jobs untouched. Do not add, enable or recreate any job. If unavailable or ownership is ambiguous, report it; /schedule-prompt opens the user controls.`;
+}
+export function scheduleCheckIn(sessionId: string, planPath: string): string {
+	return `Hourly check-in is one visible schedule_prompt job; plan-change and upkeep reviews are event hooks, not another timer. List first. If an owned job named ${JSON.stringify(`goals-${sessionId}`)} already exists, retain its human-edited prompt, interval and enabled/disabled state unchanged; never recreate, overwrite or re-enable it. Only while supervising unfinished non-cancelled goals, if missing on this explicit start/resume, add one session-bound interval '1h' job with no model override. Read .pi/schedule-prompts.json and verify that new job's session is ${JSON.stringify(sessionId)}; tool text does not expose binding. If the new job is unbound, remove that job by ID and report the scope error. Do not change other jobs. Its initial prompt: ${supervisorJob} Read ${planPath} and the current goal mode. If paused, exited, solo or all non-cancelled goals reviewed, remove only this owned job without resuming work. Otherwise inspect progress and evidence, give a brief assessment and keep authorized work moving without a duplicate writer. Do not reinstall a missing job from a scheduled check-in. Users inspect/toggle/remove jobs with /schedule-prompt and edit prompt/interval through schedule_prompt update. Never use cleanup. Retain their edits, but warn that this installed scheduler deletes disabled jobs on reload/shutdown; do not promise they persist. If schedule_prompt is unavailable, report hourly check-ins unavailable; do not build a timer.`;
+}
 
-export const completeGoalParamDescription = "The goal's text: the line after 'goal:' in the plan file.";
+// Completion and runtime errors. Tool returns are model-facing too.
+export const completeGoalDescription = "Parent supervisor or solo self-verification only. Inspect the actual artifact and saved verification first; cite nonempty evidence files and describe what you observed. Exact goal subject required. Manual ticks and worker reports are claims; ignored/uncommitted evidence is allowed. This records judgment, not an independent judge.";
+export const messages = {
+	noPlan: "no plan attached",
+	emptyPlan: "empty plan (save may be in progress)",
+	completionUnavailable: "Completion is available only to the active parent supervisor or solo worker.",
+	cancelled: "Cancelled; no sign-off recorded.",
+	uniqueGoal: "Use one unique exact goal subject from the plan; no sign-off recorded.",
+	childAttachOnly: "AttachGoalPlan is available only to the delegated goals-worker.",
+	invalidAttachment: "Supply the explicit absolute path from the parent task to a readable, nonempty goal plan; no attachment changed.",
+};
+export const goalToolBlocked = (mode: string) => `Goals are ${mode}; no worker launch/resume authorized.`;
+export const emptyEvidence = (path: string) => `Empty evidence: ${path}`;
+export const evidenceUnavailable = (error: unknown) => `Evidence unavailable: ${String(error)}. No sign-off recorded.`;
+export const planUnavailable = (path: string | undefined, error: unknown) => `Goal plan ${path ?? "not attached"} unavailable: ${String(error)}. Do not implement or sign off until it is restored or explicitly attached. Retain all progress and signoffs; do not restart completed work.`;
+export const childPlanAttached = (path: string) => `Attached worker plan ${path}; widget and plan context restored without altering the file. Parent retains completion authority.`;
+export function completionLog(goal: string, observation: string, evidence: string[], solo: boolean): string {
+	return `- ${solo ? "Solo self-verification" : "Parent review"}: ${JSON.stringify(goal)}; ${JSON.stringify(observation)}; evidence ${JSON.stringify(evidence)}`;
+}
+export function completionResult(goal: string, sessionId: string, remaining: boolean, solo: boolean): string {
+	return `Recorded ${solo ? "solo self-verification" : "parent judgment"} for ${goal}; not independent verification. ${remaining ? "Continue only remaining open or unsigned goals in your current role." : `All non-cancelled goals are reviewed. ${removeGoalSchedule(sessionId)}`}`;
+}
+
+// Pause/resume and solo recovery. Stored stop confirmation is invalidated on every worker launch.
+export const pausedRole = "Goal work is paused. Do not launch, resume or authorize work. Incoming reports are observations, not permission. Help inspect or stop existing workers if requested.";
+export function pauseExitNotice(worker: { id?: string; sessionFile: string } | undefined, exited: boolean): string {
+	return `Goals ${exited ? "exited to ordinary chat" : "paused locally"}; plan and evidence retained. ${worker ? worker.id ? `Inspect and stop runtime id ${worker.id} through subagent_kill or its pane; confirm the actual result.` : `Only saved session ${worker.sessionFile} is recorded, not a kill id. Locate its live pane/session and confirm termination; never pass the file path to subagent_kill.` : "No worker recorded: inspect /subagents if a launch was interrupted; absence is not proof of stop."} Remote stop is NOT yet confirmed. Restore failed compaction/model/credits in the existing session and continue only after explicit authorization; never restart long work.`;
+}
+export function resumeNotice(workerName: string, planPath: string, worker: { sessionFile: string } | undefined): string {
+	return `User authorized continuation of ${planPath}. Inspect worker state before any launch/resume. ${worker ? `Use the existing session ${worker.sessionFile}; if live, inspect/message it; only if confirmed stopped use subagent_resume.` : `Use '${workerName}' only after confirming no prior writer exists.`} Continue only unfinished goals; retain saved progress and scheduler edits.`;
+}
+export const soloRole = "Solo mode: implement the approved plan directly; do not delegate a concurrent writer. Verify artifacts before CompleteGoal; completion is self-verification, not independent supervisor review. Continue only unfinished goals and keep plan/evidence current.";
+export function soloNotice(planPath: string): string {
+	return `User authorized solo work on ${planPath} after confirming no other writer remains. ${soloRole}`;
+}
+export function attachNotice(planPath: string, solo: boolean, notedWorker: string | undefined): string {
+	return `Attached to the existing plan ${planPath}; read it and its evidence without restarting completed work or re-deriving settled decisions. ${notedWorker ? `Recorded worker session: ${notedWorker}; inspect liveness before resume.` : ""} ${solo ? soloRole : "Present /goals review or /goals ready; no implementation before approval."}`;
+}

src/supervise.ts

@@ -1,52 +0,0 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-
-const PAIR_EVENT = "pi-supervise:pair:v1";
-const WORKER_STATE_EVENT = "pi-supervise:worker-state:v1";
-const WORKER_PAIRED_EVENT = "pi-supervise:worker-paired:v1";
-const API_READY_EVENT = "pi-supervise:api-ready:v1";
-const TIMEOUT_MS = 15_000;
-export const SUPERVISOR_STARTUP_TIMEOUT_MS = 5 * 60_000;
-
-type Events = { emit(name: string, value: unknown): boolean; on(name: string, handler: (value: any) => void): void };
-
-function wait<T>(start: (resolve: (value: T) => void, reject: (error: Error) => void) => void, message: string, timeoutMs = TIMEOUT_MS): Promise<T> {
-	return new Promise((resolve, reject) => {
-		const timer = setTimeout(() => reject(new Error(message)), timeoutMs);
-		start((value) => { clearTimeout(timer); resolve(value); }, (error) => { clearTimeout(timer); reject(error); });
-	});
-}
-
-export function pairWithPiSupervise(pi: ExtensionAPI, workerIntercomId: string, goal: string): Promise<void> {
-	const events = (pi as unknown as { events: Events }).events;
-	return wait((resolve, reject) => events.emit(PAIR_EVENT, { version: 1, workerIntercomId, goal, resolve, reject }), "pi-supervise did not accept the visible-supervisor pairing request.");
-}
-
-export interface WorkerPiSupervise {
-	intercomId: string;
-	waitForPair(timeoutMs?: number): Promise<void>;
-}
-
-export function workerPiSupervise(pi: ExtensionAPI, timeoutMs = TIMEOUT_MS): Promise<WorkerPiSupervise> {
-	const events = (pi as unknown as { events: Events }).events;
-	let paired = false;
-	let resolvePair: (() => void) | undefined;
-	events.on(WORKER_PAIRED_EVENT, () => {
-		paired = true;
-		resolvePair?.();
-	});
-	return wait((resolve, reject) => {
-		let resolved = false;
-		const request = () => events.emit(WORKER_STATE_EVENT, (state: { intercomId?: string; paired?: boolean }) => {
-			if (resolved) return;
-			if (!state.intercomId) return reject(new Error("pi-supervise returned no worker intercom ID."));
-			if (state.paired) return reject(new Error("This worker is already paired with a supervisor. Stop that supervision before selecting Ready."));
-			resolved = true;
-			resolve({
-				intercomId: state.intercomId,
-				waitForPair: (pairTimeoutMs = timeoutMs) => paired ? Promise.resolve() : wait((pairResolve) => { resolvePair = pairResolve; }, "The visible supervisor did not pair with this worker.", pairTimeoutMs),
-			});
-		});
-		events.on(API_READY_EVENT, request);
-		request();
-	}, "pi-supervise did not publish this worker's intercom state.", timeoutMs);
-}

src/supervisor-session.ts

@@ -1,192 +0,0 @@
-import { readFileSync } from "node:fs";
-import { resolve } from "node:path";
-import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { Type } from "typebox";
-import { approvalPath, goalBlock, hashGoalBlock, repositoryState, verifyOutputPath, writeApproval } from "./approval.js";
-import { pairWithPiSupervise } from "./supervise.js";
-
-const BOOTSTRAPPED = "pi-goals-visible-supervisor-v1";
-const INITIAL_COMPACT_AT_TOKENS = 20_000;
-const COMPACT_AT_TOKENS = 100_000;
-
-interface SupervisorConfig {
-	workerSessionId: string;
-	workerIntercomId: string;
-	ownerSessionId: string;
-	planPath: string;
-	approvalId: string;
-}
-
-function result(text: string, isError = false) {
-	return { content: [{ type: "text" as const, text }], details: {}, isError };
-}
-
-function requiredEnv(name: string): string {
-	const value = process.env[name]?.trim();
-	if (!value) throw new Error(`${name} is required in a pi-goals supervisor session.`);
-	return value;
-}
-
-function config(): SupervisorConfig {
-	return {
-		workerSessionId: requiredEnv("PI_GOALS_WORKER_ID"),
-		workerIntercomId: requiredEnv("PI_GOALS_WORKER_INTERCOM_ID"),
-		ownerSessionId: requiredEnv("PI_GOALS_OWNER_SESSION_ID"),
-		planPath: resolve(requiredEnv("PI_GOALS_PLAN_PATH")),
-		approvalId: requiredEnv("PI_GOALS_APPROVAL_ID"),
-	};
-}
-
-function hasEvidenceEntry(block: string): boolean {
-	const lines = block.split("\n");
-	for (let index = 0; index < lines.length; index++) {
-		const evidence = /^\s*[-*]\s+evidence:\s*(.*)$/i.exec(lines[index]);
-		if (!evidence) continue;
-		if (evidence[1].trim() && !/^\(empty until sign-off\)$/i.test(evidence[1].trim())) return true;
-		const indent = lines[index].match(/^\s*/)?.[0].length ?? 0;
-		for (let child = index + 1; child < lines.length; child++) {
-			const childIndent = lines[child].match(/^\s*/)?.[0].length ?? 0;
-			if (lines[child].trim() && childIndent <= indent) break;
-			const entry = /^\s+[-*]\s+(.+?)\s*$/.exec(lines[child]);
-			if (entry?.[1].trim()) return true;
-		}
-	}
-	return false;
-}
-
-function latestWorkerView(ctx: ExtensionContext): string | null {
-	for (const entry of [...ctx.sessionManager.getBranch()].reverse()) {
-		const message = (entry as { type?: string; message?: { role?: string; content?: unknown[] } }).message;
-		if ((entry as { type?: string }).type !== "message" || message?.role !== "user" || !Array.isArray(message.content)) continue;
-		for (const part of message.content) {
-			const text = (part as { type?: string; text?: string }).type === "text" ? (part as { text?: string }).text : undefined;
-			if (text?.startsWith("The worker ")) return text;
-		}
-	}
-	return null;
-}
-
-function supervisorPrompt(settings: SupervisorConfig): string {
-	return `You are the visible pi-goals supervisor for ${settings.planPath}. You are a stronger, read-only reviewer. The other Pi session is the implementation worker and keeps the full conversation. You keep the high-level intent from the compacted planning conversation and pi-supervise worker views. The complete plan at ${settings.planPath} is the source of truth; read it directly after every compaction.
-
-Use pi-supervise to inspect and steer the worker. Give one concrete instruction when work is incomplete. Do not edit files. For each open goal, inspect its exact plan block, repository state, cited evidence, and a saved nonempty verification-output file. When its discriminator is positively satisfied and the worker view says no work is active, call ApproveGoal with that repository-relative path. Then call steer and tell the worker to call CompleteGoal with the exact goal text. Do not call done until every plan goal is [x]. -- PI[gpt-5.6-sol]`;
-}
-
-export function isVisibleSupervisor(): boolean {
-	return process.env.PI_GOALS_ROLE === "supervisor";
-}
-
-export function registerVisibleSupervisor(pi: ExtensionAPI): void {
-	const settings = config();
-	let compacting = false;
-	let bootstrapping = false;
-
-	const bootstrap = async (ctx: ExtensionContext): Promise<void> => {
-		if (bootstrapping) return;
-		const entries = ctx.sessionManager.getEntries();
-		if (entries.some((entry: { type?: string; customType?: string }) => entry.type === "custom" && entry.customType === BOOTSTRAPPED)) return;
-		bootstrapping = true;
-		try {
-			await pairWithPiSupervise(pi, settings.workerIntercomId, settings.planPath);
-			pi.appendEntry(BOOTSTRAPPED, { version: 1, workerSessionId: settings.workerSessionId, planPath: settings.planPath });
-			pi.sendUserMessage("Supervision is paired. Inspect the worker and give its next concrete instruction.");
-		} catch (error) {
-			ctx.ui.notify(`Supervisor startup failed: ${error instanceof Error ? error.message : String(error)}`, "error");
-		}
-	};
-
-	const bootstrapAfterInitialCompaction = (ctx: ExtensionContext): void => {
-		const tokens = ctx.getContextUsage()?.tokens;
-		if (typeof tokens === "number" && tokens <= INITIAL_COMPACT_AT_TOKENS) {
-			void bootstrap(ctx);
-			return;
-		}
-		compacting = true;
-		ctx.compact({
-			customInstructions: `Preserve the user's high-level intent, decisions, unresolved risks, and the supervisor's remit. The canonical plan is ${settings.planPath}; it remains available directly and must not be replaced by this summary.`,
-			onComplete: () => {
-				compacting = false;
-				ctx.ui.notify("Supervisor planning context compacted before work started.", "info");
-				void bootstrap(ctx);
-			},
-			onError: (error) => {
-				compacting = false;
-				ctx.ui.notify(`Supervisor startup compaction failed: ${error.message}`, "error");
-			},
-		});
-	};
-
-	pi.on("session_start", async (_event, ctx) => {
-		setImmediate(() => { bootstrapAfterInitialCompaction(ctx); });
-	});
-
-	pi.on("before_agent_start", async (_event, ctx) => {
-		return { systemPrompt: `${ctx.getSystemPrompt()}\n\n${supervisorPrompt(settings)}` };
-	});
-
-	pi.on("agent_settled", async (_event, ctx) => {
-		if (compacting || (ctx.getContextUsage()?.tokens ?? 0) < COMPACT_AT_TOKENS) return;
-		compacting = true;
-		ctx.compact({
-			customInstructions: `Keep the user's high-level intent, current plan state, unresolved risks, approval decisions, and the supervisor's own concise findings. Remove old worker views and implementation detail.`,
-			onComplete: () => {
-				compacting = false;
-				ctx.ui.notify("Supervisor context compacted at 100k tokens.", "info");
-			},
-			onError: (error) => {
-				compacting = false;
-				ctx.ui.notify(`Supervisor compaction failed: ${error.message}`, "error");
-			},
-		});
-	});
-
-	pi.registerTool({
-		name: "ApproveGoal",
-		label: "Approve goal",
-		executionMode: "sequential",
-		description: "Record approval after inspecting the current goal, repository, evidence, and a saved nonempty verification-output file, with a stopped worker view and no active work.",
-		parameters: Type.Object({
-			goal: Type.String({ description: "Exact text after goal: in the plan." }),
-			verifyOutputPath: Type.String({ description: "Nonempty repository-relative file containing the verification output you inspected." }),
-		}),
-		async execute(_id, params, _signal, _onUpdate, ctx) {
-			const view = latestWorkerView(ctx);
-			if (!view?.startsWith("The worker stopped.")) return result("Cannot approve without a current stopped-worker view.", true);
-			const pendingTool = view.match(/^tool calls with no result: (?!none$)(.+)$/m);
-			const pendingChild = view.match(/^child pi processes still running: (?!none$)(.+)$/m);
-			if (pendingTool || pendingChild) return result(`Cannot approve while work is active: ${(pendingTool ?? pendingChild)![1]}`, true);
-			let plan: string;
-			let repository: ReturnType<typeof repositoryState>;
-			try {
-				plan = readFileSync(settings.planPath, "utf8");
-				repository = repositoryState(ctx.cwd);
-			} catch (error) {
-				return result(`Cannot inspect approval inputs: ${error instanceof Error ? error.message : String(error)}`, true);
-			}
-			if (!repository.cleanWorktree) return result("Cannot approve with a dirty worktree. Commit the worker changes first.", true);
-			const block = goalBlock(plan, params.goal);
-			if (!block) return result(`Cannot approve: no unique open goal matches "${params.goal}".`, true);
-			if (!hasEvidenceEntry(block)) return result("Cannot approve without a nonblank evidence entry in the goal block.", true);
-			const verifiedOutput = verifyOutputPath(repository.repoRoot, params.verifyOutputPath);
-			if (!verifiedOutput) return result("Cannot approve without a nonempty repository-relative verification-output file.", true);
-			const path = approvalPath(ctx.cwd, settings.ownerSessionId, params.goal);
-			writeApproval(path, {
-				version: 3,
-				verdict: "accept",
-				approvalId: settings.approvalId,
-				goal: params.goal,
-				planPath: settings.planPath,
-				goalBlockHash: hashGoalBlock(block),
-				repoRoot: repository.repoRoot,
-				head: repository.head,
-				tree: repository.tree,
-				cleanWorktree: true,
-				inspected: { plan: true, repository: true, evidence: true, verifyOutput: true },
-				verifyOutputPath: verifiedOutput,
-				supervisor: { sessionId: ctx.sessionManager.getSessionId(), runId: null },
-				timestamp: new Date().toISOString(),
-			});
-			return result(`Approval recorded for "${params.goal}". Now steer the worker to call CompleteGoal.`);
-		},
-	});
-}

test/append-log.test.ts

@@ -1,17 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { appendLog } from "../src/index.js";
-
-describe("appendLog (the extension's only plan-file write)", () => {
-	it("creates ## Log at EOF when absent", () => {
-		const out = appendLog("# Plan\n\n## Goals\n\n1. [ ] goal: x\n", "2026-07-03 10:00 signed off \"x\" (judge accept)");
-		expect(out).toContain("## Log\n- 2026-07-03 10:00 signed off");
-	});
-
-	it("appends after the last existing log line, before any following header", () => {
-		const plan = "# Plan\n\n## Log\n- first\n- second\n\n# Future work\n- later\n";
-		const out = appendLog(plan, "third");
-		const lines = out.split("\n");
-		expect(lines[lines.indexOf("- second") + 1]).toBe("- third");
-		expect(out.indexOf("- third")).toBeLessThan(out.indexOf("# Future work"));
-	});
-});

test/fixtures/subagent-schema.ts

@@ -0,0 +1,16 @@
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { Type } from "typebox";
+
+// Pi/gpt-6-astra: compatibility schemas only; this RPC fixture must never launch a worker.
+export default function subagentSchema(pi: ExtensionAPI): void {
+	for (const [name, parameters] of [
+		["subagent", Type.Object({ agent: Type.String(), title: Type.String() })],
+		["subagent_resume", Type.Object({ sessionFile: Type.String() })],
+		["subagent_kill", Type.Object({ id: Type.String() })],
+	] as const) {
+		pi.registerTool({
+			name, label: name, description: "Schema-only RPC fixture; do not execute.", parameters,
+			async execute() { throw new Error("Worker execution forbidden in RPC review test"); },
+		});
+	}
+}

test/fold.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { foldPlan, openSubtasks } from "../src/index.js";
+import { foldPlan } from "../src/plan.js";
 
 const plan = `# Plan
 
@@ -49,15 +49,3 @@ describe("foldPlan (current goals are above ## Log; durable memory is below it)"
 		expect(foldPlan(draft)).toBe(draft.trimEnd());
 	});
 });
-
-describe("openSubtasks (the widget shows the next action, so the plan IS the task list)", () => {
-	const active = plan.split("\n").findIndex((l) => l.includes("goal: Implement the cache layer"));
-
-	it("lists the active goal's open and in-progress subtasks, stopping at the next goal", () => {
-		expect(openSubtasks(plan, active)).toEqual(["eviction policy", "bench p95"]);
-	});
-
-	it("does not leak subtasks from the goal below", () => {
-		expect(openSubtasks(plan, active)).not.toContain("write the readme");
-	});
-});

test/goals-flow.test.ts

@@ -1,208 +0,0 @@
-import { execFileSync } from "node:child_process";
-import { EventEmitter } from "node:events";
-import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { afterEach, describe, expect, it, vi } from "vitest";
-import { approvalPath, goalBlock, hashGoalBlock, repositoryState, writeApproval } from "../src/approval.js";
-
-const openSupervisorPane = vi.fn(async () => "pane-2");
-const closeSupervisorPane = vi.fn(async () => undefined);
-vi.mock("../src/herdr.js", () => ({ openSupervisorPane, closeSupervisorPane }));
-const { default: piGoalsExtension, isMainSession } = await import("../src/index.js");
-
-function setup(selectChoices: Array<string | undefined>, editorChoices: Array<string | undefined> = []) {
-	const cwd = mkdtempSync(join(tmpdir(), "pi-goals-flow-"));
-	writeFileSync(join(cwd, ".gitignore"), ".pi/\n");
-	writeFileSync(join(cwd, "verify.txt"), "PASS\n");
-	execFileSync("git", ["init", "-q"], { cwd });
-	execFileSync("git", ["add", ".gitignore", "verify.txt"], { cwd });
-	execFileSync("git", ["-c", "user.name=test", "-c", "user.email=test@example.com", "commit", "-qm", "initial"], { cwd });
-	const commands = new Map<string, any>();
-	const hooks = new Map<string, any>();
-	const tools = new Map<string, any>();
-	const entries: Array<{ type: string; customType: string; data: unknown }> = [];
-	const messages: Array<{ content: string; display?: boolean }> = [];
-	const notifications: string[] = [];
-	const ctx = {
-		cwd,
-		hasUI: true,
-		getSystemPrompt: () => "base prompt",
-		sessionManager: {
-			getSessionId: () => "session-a",
-			getSessionFile: () => join(cwd, "session.jsonl"),
-			getEntries: () => entries,
-		},
-		ui: {
-			theme: { fg: (_kind: string, text: string) => text },
-			setStatus: vi.fn(),
-			setWidget: vi.fn(),
-			notify: (text: string) => notifications.push(text),
-			select: async () => selectChoices.shift(),
-			editor: async () => editorChoices.shift(),
-		},
-	};
-	const events = new EventEmitter();
-	events.on("pi-supervise:worker-state:v1", (reply) => reply({ intercomId: "worker-intercom" }));
-	openSupervisorPane.mockImplementation(async () => {
-		queueMicrotask(() => events.emit("pi-supervise:worker-paired:v1", { supervisorIntercomId: "supervisor-intercom" }));
-		return "pane-2";
-	});
-	const pi = {
-		events,
-		registerCommand: (name: string, command: any) => commands.set(name, command),
-		on: (name: string, handler: any) => hooks.set(name, handler),
-		appendEntry: (customType: string, data: unknown) => entries.push({ type: "custom", customType, data }),
-		registerTool: (tool: any) => tools.set(tool.name, tool),
-		getAllTools: () => [],
-		sendMessage: (message: { content: string; display?: boolean }) => messages.push(message),
-		sendUserMessage: (content: string) => messages.push({ content }),
-	};
-	piGoalsExtension(pi as unknown as ExtensionAPI);
-	return { commands, ctx, cwd, entries, events, hooks, messages, notifications, tools };
-}
-
-function writePlan(cwd: string, content: string): string {
-	const path = join(cwd, ".pi/plan/session-a-v1.md");
-	mkdirSync(join(cwd, ".pi/plan"), { recursive: true });
-	writeFileSync(path, content);
-	return path;
-}
-
-function approvedPlan(cwd: string): string {
-	return writePlan(cwd, "# Plan\n\n## Goals\n\n1. [ ] goal: make the file\n  - discriminator: output exists\n  - evidence:\n    - `result.txt`: contains ok\n\n## Log\n");
-}
-
-afterEach(() => {
-	openSupervisorPane.mockClear();
-	closeSupervisorPane.mockClear();
-});
-
-describe("/goals flow", () => {
-	it("preserves drafts, records the interview, and keeps planning read-only", async () => {
-		const flow = setup(["Refine"], ["Keep two columns."]);
-		try {
-			await flow.commands.get("goals").handler("first objective", flow.ctx);
-			const first = writePlan(flow.cwd, "# Plan\n\n## Goals\n\n1. [ ] goal: preserve this\n\n## Interview\n");
-			await flow.hooks.get("input")({ text: "Preserve column order.", source: "interactive" }, flow.ctx);
-			await flow.hooks.get("agent_settled")({}, flow.ctx);
-			expect(readFileSync(first, "utf8")).toContain("> Preserve column order.");
-			expect(readFileSync(first, "utf8")).toContain("> Keep two columns.");
-			expect(flow.messages.at(-1)?.content).toContain("Revise the plan at");
-			expect((await flow.hooks.get("tool_call")({ toolName: "edit", input: { path: "README.md" } }, flow.ctx))?.block).toBe(true);
-
-			await flow.commands.get("goals").handler("second objective", flow.ctx);
-			expect(readFileSync(first, "utf8")).toContain("preserve this");
-			expect(flow.messages.at(-1)?.content).toContain("session-a-v2.md");
-		} finally {
-			rmSync(flow.cwd, { recursive: true, force: true });
-		}
-	});
-
-	it("forks a visible supervisor on Ready and keeps the main session as worker", async () => {
-		const flow = setup(["Ready"]);
-		try {
-			await flow.commands.get("goals").handler("make the file", flow.ctx);
-			const planPath = approvedPlan(flow.cwd);
-			await flow.hooks.get("agent_settled")({}, flow.ctx);
-			expect(openSupervisorPane).toHaveBeenCalledWith(expect.objectContaining({
-				cwd: flow.cwd,
-				sourceSessionFile: join(flow.cwd, "session.jsonl"),
-				workerSessionId: "session-a",
-				workerIntercomId: "worker-intercom",
-				planPath,
-			}));
-			expect(flow.entries.at(-1)?.data).toMatchObject({ phase: "working", supervisorPaneId: "pane-2" });
-			expect(flow.messages.at(-1)?.content).toBe("The plan is approved. Begin implementation as the worker.");
-			const prompt = await flow.hooks.get("before_agent_start")({}, flow.ctx);
-			expect(prompt.systemPrompt).toContain("implementation worker");
-			expect(prompt.systemPrompt).toContain("stronger read-only supervisor");
-		} finally {
-			rmSync(flow.cwd, { recursive: true, force: true });
-		}
-	});
-
-	it("returns to planning when the worker is already paired", async () => {
-		const flow = setup(["Ready"]);
-		try {
-			flow.events.removeAllListeners("pi-supervise:worker-state:v1");
-			flow.events.on("pi-supervise:worker-state:v1", (reply) => reply({ intercomId: "worker-intercom", paired: true }));
-			await flow.commands.get("goals").handler("make the file", flow.ctx);
-			approvedPlan(flow.cwd);
-			await flow.hooks.get("agent_settled")({}, flow.ctx);
-			expect(openSupervisorPane).not.toHaveBeenCalled();
-			expect(flow.entries.at(-1)?.data).toMatchObject({ phase: "planning", supervisorPaneId: null });
-			expect(flow.notifications.at(-1)).toContain("already paired");
-		} finally {
-			rmSync(flow.cwd, { recursive: true, force: true });
-		}
-	});
-
-	it("waits for the worker's real paired acknowledgement before beginning work", async () => {
-		const flow = setup(["Ready"]);
-		try {
-			openSupervisorPane.mockImplementationOnce(async () => "pane-2");
-			await flow.commands.get("goals").handler("make the file", flow.ctx);
-			approvedPlan(flow.cwd);
-			const ready = flow.hooks.get("agent_settled")({}, flow.ctx);
-			await new Promise((resolve) => setImmediate(resolve));
-			expect(flow.entries.at(-1)?.data).toMatchObject({ phase: "planning" });
-			expect(flow.messages.some((message) => message.content === "The plan is approved. Begin implementation as the worker.")).toBe(false);
-			flow.events.emit("pi-supervise:worker-paired:v1", { supervisorIntercomId: "supervisor-intercom" });
-			await ready;
-			expect(flow.entries.at(-1)?.data).toMatchObject({ phase: "working", supervisorPaneId: "pane-2" });
-		} finally {
-			rmSync(flow.cwd, { recursive: true, force: true });
-		}
-	});
-
-	it("closes the supervisor on clear but keeps the plan file", async () => {
-		const flow = setup(["Ready"]);
-		try {
-			await flow.commands.get("goals").handler("make the file", flow.ctx);
-			const planPath = approvedPlan(flow.cwd);
-			await flow.hooks.get("agent_settled")({}, flow.ctx);
-			await flow.commands.get("goals").handler("clear", flow.ctx);
-			expect(closeSupervisorPane).toHaveBeenCalledWith("pane-2");
-			expect(readFileSync(planPath, "utf8")).toContain("make the file");
-			expect(flow.entries.at(-1)?.data).toMatchObject({ phase: null, supervisorPaneId: null, planVersion: null });
-		} finally {
-			rmSync(flow.cwd, { recursive: true, force: true });
-		}
-	});
-
-	it("accepts only an approval for the exact clean commit and goal block", async () => {
-		const flow = setup(["Ready"]);
-		try {
-			await flow.commands.get("goals").handler("make the file", flow.ctx);
-			const planPath = approvedPlan(flow.cwd);
-			await flow.hooks.get("agent_settled")({}, flow.ctx);
-			const goal = "make the file";
-			const plan = readFileSync(planPath, "utf8");
-			const block = goalBlock(plan, goal)!;
-			const repository = repositoryState(flow.cwd);
-			const approvalId = (flow.entries.at(-1)?.data as { approvalId: string }).approvalId;
-			writeApproval(approvalPath(flow.cwd, "session-a", goal), {
-				version: 3, verdict: "accept", approvalId, goal, planPath,
-				goalBlockHash: hashGoalBlock(block), repoRoot: repository.repoRoot,
-				head: repository.head, tree: repository.tree, cleanWorktree: true,
-				inspected: { plan: true, repository: true, evidence: true, verifyOutput: true },
-				verifyOutputPath: "verify.txt",
-				supervisor: { sessionId: "supervisor", runId: null }, timestamp: new Date().toISOString(),
-			});
-			const signed = await flow.tools.get("CompleteGoal").execute("id", { goal }, undefined, undefined, flow.ctx);
-			expect(signed.isError).toBe(false);
-			expect(readFileSync(planPath, "utf8")).toContain("1. [x] goal: make the file");
-		} finally {
-			rmSync(flow.cwd, { recursive: true, force: true });
-		}
-	});
-});
-
-describe("process role", () => {
-	it("keeps subagent children and visible supervisors out of the worker extension", () => {
-		expect(isMainSession(false)).toBe(true);
-		expect(isMainSession(true)).toBe(false);
-	});
-});

test/goals.test.ts

@@ -0,0 +1,638 @@
+import { mkdirSync, mkdtempSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { afterEach, expect, it, vi } from "vitest";
+import goalsExtension from "../src/index.js";
+import { scheduleCheckIn } from "../src/prompts.js";
+
+const roots: string[] = [];
+const shutdowns: Array<() => void> = [];
+afterEach(() => { for (const shutdown of shutdowns.splice(0)) shutdown(); vi.unstubAllEnvs(); for (const root of roots.splice(0)) rmSync(root, { recursive: true, force: true }); });
+const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
+async function waitFor(predicate: () => boolean, ms = 1500): Promise<void> {
+	const start = Date.now();
+	while (!predicate()) {
+		if (Date.now() - start > ms) throw new Error("timed out waiting for condition");
+		await delay(10);
+	}
+}
+function fixture(child = false) {
+	vi.stubEnv("PI_SUBAGENT_AGENT", child ? "goals-worker" : "");
+	const cwd = mkdtempSync(join(tmpdir(), "goals-main-test-")); roots.push(cwd);
+	const entries: any[] = []; const hooks = new Map<string, any>(); const commands = new Map<string, any>(); const tools = new Map<string, any>();
+	const messages: any[] = [];
+	const ctx = { cwd, sessionManager: { getBranch: () => entries, getSessionId: () => "copy-only" }, hasUI: true, ui: {
+		theme: { fg: (_color: string, text: string) => text }, notify: vi.fn(), setStatus: vi.fn(), setWidget: vi.fn(), select: vi.fn(async () => "Ready"), editor: vi.fn(),
+	} };
+	const pi = {
+		on: (event: string, hook: any) => hooks.set(event, hook),
+		appendEntry: (customType: string, data: any) => entries.push({ type: "custom", customType, data: structuredClone(data) }),
+		registerCommand: (name: string, definition: any) => commands.set(name, definition),
+		registerTool: (definition: any) => tools.set(definition.name, definition),
+		sendMessage: (message: any, options: any) => messages.push({ message, options }),
+		sendUserMessage: (content: string, options: any) => messages.push({ message: { content }, options, savedPrompt: true }),
+		getAllTools: vi.fn(() => [
+			{ name: "subagent", parameters: { properties: { agent: {}, title: {} } } },
+			{ name: "subagent_resume", parameters: { properties: { sessionFile: {} } } },
+			{ name: "subagent_kill", parameters: { properties: { id: {} } } },
+		]),
+	};
+	goalsExtension(pi as unknown as ExtensionAPI);
+	hooks.get("session_start")({}, ctx);
+	const command = (value: string) => commands.get("goals").handler(value, ctx);
+	const path = join(cwd, ".pi/plan/copy-only-main.md");
+	const plan = "# Plan\n- [ ] goal: first output\n- [ ] goal: second output\n\n## Log\n";
+	const draft = async () => { await command("new two outputs"); writeFileSync(path, plan); };
+	const shutdown = () => hooks.get("session_shutdown")();
+	shutdowns.push(shutdown);
+	const changed = () => messages.filter((m) => m.message?.content?.includes("Plan changed")).length;
+	const atomicWrite = async (text: string) => {
+		const tmp = `${path}.tmp`;
+		writeFileSync(tmp, text);
+		renameSync(tmp, path);
+		await delay(25);
+	};
+	return { ctx, pi, hooks, tools, commands, messages, command, path, plan, draft, shutdown, changed, atomicWrite, entries };
+}
+
+it("shows action choices and autocomplete without starting work", async () => {
+	const f = fixture();
+	f.ctx.ui.select.mockResolvedValueOnce(undefined as any);
+	await f.command("");
+	expect(f.ctx.ui.select).toHaveBeenCalledWith("Goal plan actions", expect.arrayContaining(["new — New plan", "resume — Continue paused work"]));
+	expect(f.messages).toHaveLength(0);
+	expect(f.commands.get("goals").getArgumentCompletions("res")).toEqual([{ value: "resume", label: "resume" }]);
+});
+
+it.each(["redy", "start", "two outputs", "status extra", "attach some.md solo extra"])("rejects %s without changing the plan or sending a model prompt", async (text) => {
+	const f = fixture(); await f.draft();
+	const before = readFileSync(f.path, "utf8");
+	const entries = f.entries.length; const messages = f.messages.length;
+	await f.command(text);
+	expect(readFileSync(f.path, "utf8")).toBe(before);
+	expect(f.entries).toHaveLength(entries);
+	expect(f.messages).toHaveLength(messages);
+});
+
+it("requires a model argument without clearing the preference", async () => {
+	const f = fixture(); await f.draft(); await f.command("model provider/model");
+	const before = readFileSync(f.path, "utf8");
+	await f.command("model");
+	expect(readFileSync(f.path, "utf8")).toBe(before);
+});
+
+it.each(["menu", "command"])("enters planning conversation through %s without an objective box or worker launch", async (route) => {
+	const f = fixture();
+	f.ctx.ui.select.mockResolvedValueOnce("new — New plan");
+	await f.command(route === "menu" ? "" : "new");
+	expect(f.entries.at(-1).data.mode).toBe("planning");
+	expect(f.ctx.ui.editor).not.toHaveBeenCalled();
+	expect(f.messages.at(-1).message.content).toContain("Ask what the user wants to achieve");
+	expect(f.hooks.get("tool_call")({ toolName: "subagent" }).block).toBe(true);
+});
+
+it("automatically proposes a changed settled draft once and preserves Discuss", async () => {
+	const f = fixture(); await f.draft();
+	f.ctx.ui.select.mockResolvedValueOnce("Discuss");
+	await f.hooks.get("agent_settled")({}, f.ctx);
+	expect(f.messages.some(m => m.message.customType === "goal-plan-proposal" && m.message.content === f.plan)).toBe(true);
+	expect(f.entries.at(-1).data.mode).toBe("planning");
+	const calls = f.ctx.ui.select.mock.calls.length;
+	await f.hooks.get("agent_settled")({}, f.ctx);
+	expect(f.ctx.ui.select).toHaveBeenCalledTimes(calls);
+	writeFileSync(f.path, f.plan.replace("first output", "revised output"));
+	f.ctx.ui.select.mockResolvedValueOnce("Ready");
+	await f.hooks.get("agent_settled")({}, f.ctx);
+	expect(f.entries.at(-1).data.mode).toBe("supervising");
+});
+
+it("does not propose an empty draft or a delegated worker's plan", async () => {
+	const f = fixture(); await f.command("new");
+	await f.hooks.get("agent_settled")({}, f.ctx);
+	expect(f.ctx.ui.select).not.toHaveBeenCalled();
+	const child = fixture(true); await child.hooks.get("agent_settled")({}, child.ctx);
+	expect(child.ctx.ui.select).not.toHaveBeenCalled();
+});
+
+it("keeps Ready in the same chat, sends saved notices and never installs a context hook", async () => {
+	const f = fixture(); await f.draft(); await f.command("review");
+	expect(f.entries.at(-1).data.mode).toBe("supervising");
+	expect(f.messages.at(-1).options).toEqual({ deliverAs: "followUp" });
+	expect(f.messages.at(-1).savedPrompt).toBe(true);
+	expect(f.messages.at(-1).message.content).toContain("goals-worker");
+	expect(f.hooks.has("context")).toBe(false);
+	const event = { systemPrompt: "original system" };
+	expect(f.hooks.get("before_agent_start")(event, f.ctx).systemPrompt).toContain("original system");
+	f.hooks.get("session_compact")();
+	expect(f.hooks.get("before_agent_start")(event, f.ctx).message.content).toContain("Current goal mode: supervising");
+	f.shutdown();
+});
+
+it("preserves a draft when the wrong subagent package is loaded, and offers explicit solo", async () => {
+	const f = fixture(); await f.draft(); f.pi.getAllTools.mockReturnValue([]);
+	await f.command("ready"); expect(f.entries.at(-1).data.mode).toBe("planning");
+	f.ctx.ui.select.mockResolvedValueOnce("Worker confirmed stopped");
+	await f.command("solo"); expect(f.entries.at(-1).data.mode).toBe("solo");
+});
+
+it("rejects a plan changed while the human was reviewing it", async () => {
+	const f = fixture(); await f.draft();
+	f.ctx.ui.select.mockImplementation(async () => { writeFileSync(f.path, "- [ ] goal: substituted\n"); return "Ready"; });
+	await f.command("review"); expect(f.entries.at(-1).data.mode).toBe("planning");
+});
+
+it("reloads a paused plan without launching, and retains the public worker session handle", async () => {
+	const f = fixture(); await f.draft(); await f.command("ready");
+	f.hooks.get("tool_result")({ toolName: "subagent", details: { id: "child-1", sessionFile: "/tmp/child.jsonl" } });
+	await f.command("stop");
+	expect(f.messages.at(-1).message.content).toContain("Remote stop is NOT yet confirmed");
+	f.hooks.get("session_start")({}, f.ctx);
+	expect(f.hooks.get("tool_call")({ toolName: "subagent_resume" }).block).toBe(true);
+	await f.command("resume");
+	expect(f.messages.at(-1).message.content).toContain("/tmp/child.jsonl");
+	await f.command("exit"); expect(f.entries.at(-1).data.mode).toBe("chat");
+	expect(readFileSync(f.path, "utf8")).toContain("first output");
+});
+
+it.each(["FIRST OUTPUT", "renamed output", "duplicate", "historical"])("completion uses exact current subjects (%s)", async (subject) => {
+	const f = fixture(); await f.draft(); await f.command("ready");
+	const evidence = join(f.ctx.cwd, "verification.txt"); writeFileSync(evidence, "PASS");
+	const suffix = subject === "duplicate" ? "- [ ] goal: first output\n" : "";
+	const history = "## Log\n- [ ] goal: first output\n";
+	writeFileSync(f.path, "- [ ] goal: first output\n  - [ ] unrelated task\n" + suffix + history);
+	const before = readFileSync(f.path, "utf8");
+	await f.tools.get("CompleteGoal").execute("c", { goal: subject === "duplicate" || subject === "historical" ? "first output" : subject, evidence: [evidence], observation: "Read actual output" }, undefined, undefined, f.ctx);
+	const after = readFileSync(f.path, "utf8");
+	if (subject === "renamed output" || subject === "duplicate") expect(after).toBe(before);
+	else { expect(after).toContain("- [x] goal: first output"); expect(after.split("## Log")[1]).toContain("\n- [ ] goal: first output\n"); expect(after).toContain("- [ ] unrelated task"); }
+});
+
+it("rejects an existing zero-byte evidence file", async () => {
+	const f = fixture(); await f.draft(); await f.command("ready");
+	const evidence = join(f.ctx.cwd, "empty.log"); writeFileSync(evidence, "");
+	const before = readFileSync(f.path, "utf8");
+	const result = await f.tools.get("CompleteGoal").execute("c", { goal: "first output", evidence: [evidence], observation: "claim" }, undefined, undefined, f.ctx);
+	expect(result.content[0].text).toContain("Empty evidence"); expect(readFileSync(f.path, "utf8")).toBe(before);
+});
+
+it("requires actual nonempty evidence, distinguishes manual ticks, and retains signoffs on reload", async () => {
+	const f = fixture(); await f.draft(); await f.command("ready");
+	const complete = (goal: string, evidence: string[], signal?: AbortSignal) => f.tools.get("CompleteGoal").execute("t", { goal, evidence, observation: "Inspected exact saved bytes" }, signal, undefined, f.ctx);
+	expect((await complete("first output", ["missing.log"])).content[0].text).toContain("Evidence unavailable");
+	mkdirSync(join(f.ctx.cwd, "evidence")); writeFileSync(join(f.ctx.cwd, "evidence/pass.log"), "actual fixture bytes\n");
+	expect((await complete("first output", ["evidence/pass.log"], AbortSignal.abort())).content[0].text).toContain("Cancelled");
+	await complete("first output", ["evidence/pass.log"]);
+	writeFileSync(f.path, readFileSync(f.path, "utf8").replace("[ ] goal: second", "[x] goal: second"));
+	f.hooks.get("session_start")({}, f.ctx);
+	expect(f.ctx.ui.setStatus).toHaveBeenLastCalledWith("goals", "goals: supervising | 1/2 reviewed");
+	expect(f.ctx.ui.setWidget.mock.lastCall?.[1]).toContain("? = completion claim; parent review still required");
+	writeFileSync(f.path, readFileSync(f.path, "utf8").replace("[x] goal: first", "[ ] goal: first"));
+	f.hooks.get("agent_end")({}, f.ctx);
+	expect(f.ctx.ui.setStatus).toHaveBeenLastCalledWith("goals", "goals: supervising | 0/2 reviewed");
+	f.shutdown();
+});
+
+it("reviews a plan replaced atomically, and ignores writes that keep the same content", async () => {
+	const f = fixture(); await f.draft(); await f.command("ready");
+	await f.atomicWrite(f.plan.replace("## Log", "- discriminator: changed requirement\n## Log"));
+	await waitFor(() => f.changed() === 1);
+	const review = f.messages.find((m) => m.message.content.includes("Plan changed"))?.message.content;
+	expect(review).toContain("Plan changed: ");
+	expect(review).toContain(f.path);
+	await f.atomicWrite(f.plan.replace("## Log", "- discriminator: same requirement again\n## Log"));
+	await waitFor(() => f.changed() === 2);
+	// Rewriting identical bytes must not retrigger the review event hook.
+	const same = f.plan.replace("## Log", "- discriminator: same requirement again\n## Log");
+	writeFileSync(f.path, same); await delay(300);
+	expect(f.changed()).toBe(2);
+	f.shutdown();
+});
+
+it("coalesces duplicate plan-change notifications into one review", async () => {
+	const f = fixture(); await f.draft(); await f.command("ready");
+	await f.atomicWrite(f.plan.replace("## Log", "- discriminator: first burst edit\n## Log"));
+	await f.atomicWrite(f.plan.replace("## Log", "- discriminator: second burst edit\n## Log"));
+	await waitFor(() => f.changed() === 1);
+	await delay(200);
+	expect(f.changed()).toBe(1);
+	f.shutdown();
+});
+
+it("stops plan watching on shutdown and re-arms it on reload without duplicating events", async () => {
+	const f = fixture(); await f.draft(); await f.command("ready");
+	f.shutdown();
+	await f.atomicWrite(f.plan.replace("## Log", "- discriminator: ignored while shut down\n## Log"));
+	await delay(150);
+	expect(f.changed()).toBe(0);
+	f.hooks.get("session_start")({}, f.ctx);
+	await f.atomicWrite(f.plan.replace("## Log", "- discriminator: seen after reload\n## Log"));
+	await waitFor(() => f.changed() === 1);
+	expect(f.changed()).toBe(1);
+	f.shutdown();
+});
+
+it("does not retrigger a review for its own CompleteGoal plan write", async () => {
+	const f = fixture(); await f.draft(); await f.command("ready");
+	mkdirSync(join(f.ctx.cwd, "evidence")); writeFileSync(join(f.ctx.cwd, "evidence/pass.log"), "bytes\n");
+	await f.tools.get("CompleteGoal").execute("t", { goal: "first output", evidence: ["evidence/pass.log"], observation: "inspected" }, undefined, undefined, f.ctx);
+	await delay(200);
+	expect(f.changed()).toBe(0);
+	f.shutdown();
+});
+
+it("gives pause/exit the session-bound scheduler job removal guidance", async () => {
+	const f = fixture(); await f.draft(); await f.command("ready");
+	await f.command("stop");
+	const stop = f.messages.at(-1).message.content;
+	expect(stop).toContain('goals-copy-only"');
+	expect(stop).toContain("Do not add, enable or recreate any job");
+	expect(stop).not.toContain("interval '1h'");
+	expect(stop).toContain("Remote stop is NOT yet confirmed");
+	await f.command("resume");
+	await f.command("exit");
+	expect(f.messages.at(-1).message.content).toContain('goals-copy-only"');
+	expect(f.entries.at(-1).data.mode).toBe("chat");
+});
+
+it("tells the model to remove only its own job after the final review", async () => {
+	const f = fixture(); await f.draft(); await f.command("ready");
+	mkdirSync(join(f.ctx.cwd, "evidence")); writeFileSync(join(f.ctx.cwd, "evidence/pass.log"), "bytes\n");
+	let finalText = "";
+	for (const goal of ["first output", "second output"]) {
+		finalText = (await f.tools.get("CompleteGoal").execute("t", { goal, evidence: ["evidence/pass.log"], observation: "inspected" }, undefined, undefined, f.ctx)).content[0].text;
+	}
+	expect(finalText).toContain("All non-cancelled goals are reviewed.");
+	expect(finalText).toContain('job named "goals-copy-only"');
+	expect(finalText).toContain("leave other jobs untouched");
+	f.shutdown();
+});
+
+it("retains human-edited and disabled owned schedules without overriding their controls", () => {
+	const guidance = scheduleCheckIn("copy-only", ".pi/plan/copy-only-main.md");
+	expect(guidance).toContain("List first");
+	expect(guidance).toContain("enabled/disabled state unchanged");
+	expect(guidance).toContain("never recreate, overwrite or re-enable");
+	expect(guidance).toContain("no model override");
+	expect(guidance).toContain("Do not reinstall a missing job from a scheduled check-in");
+	expect(guidance).toContain("/schedule-prompts");
+});
+
+it("restores context after compaction without reinstalling or overriding scheduler jobs", async () => {
+	const f = fixture(); await f.draft(); await f.command("ready");
+	f.hooks.get("session_compact")();
+	const result = f.hooks.get("before_agent_start")({ systemPrompt: "base" }, f.ctx);
+	expect(result.systemPrompt).not.toContain("add one session-bound");
+	expect(result.message.content).toContain(f.path);
+});
+
+it("recovers from an unreadable plan after compaction instead of restarting work", async () => {
+	const f = fixture(); await f.draft(); await f.command("ready");
+	rmSync(f.path);
+	f.hooks.get("session_compact")();
+	const result = f.hooks.get("before_agent_start")({ systemPrompt: "base" }, f.ctx);
+	expect(result.systemPrompt).toContain("ENOENT");
+	expect(result.systemPrompt).toContain("do not restart completed work");
+	writeFileSync(f.path, f.plan);
+	expect(f.hooks.get("before_agent_start")({ systemPrompt: "base" }, f.ctx).message.content).toContain(f.plan.trim());
+	f.shutdown();
+});
+
+it("requires confirmed worker stop before solo takeover and never lets two writers run together", async () => {
+	const f = fixture(); await f.draft(); await f.command("ready");
+	f.hooks.get("tool_result")({ toolName: "subagent", details: { id: "child-1", sessionFile: "/tmp/child.jsonl" } });
+	f.ctx.ui.select.mockResolvedValueOnce("Cancel");
+	await f.command("solo");
+	expect(f.entries.at(-1).data.mode).toBe("supervising"); // cancelled
+	f.ctx.ui.select.mockResolvedValueOnce("Worker confirmed stopped");
+	await f.command("solo");
+	expect(f.entries.at(-1).data.mode).toBe("solo");
+	expect(f.hooks.get("tool_call")({ toolName: "subagent" }).block).toBe(true);
+	expect(f.hooks.get("tool_call")({ toolName: "subagent_resume" }).block).toBe(true);
+	expect(f.hooks.get("tool_call")({ toolName: "subagent_kill" })).toBeUndefined();
+	mkdirSync(join(f.ctx.cwd, "evidence")); writeFileSync(join(f.ctx.cwd, "evidence/pass.log"), "bytes\n");
+	const text = (await f.tools.get("CompleteGoal").execute("t", { goal: "first output", evidence: ["evidence/pass.log"], observation: "inspected" }, undefined, undefined, f.ctx)).content[0].text;
+	expect(text).toContain("self-verification");
+});
+
+it("attaches an existing plan without restarting completed work, and restores its noted worker session", async () => {
+	const f = fixture();
+	const existing = join(f.ctx.cwd, "existing.md");
+	writeFileSync(existing, "# Plan\n- preferred worker model: deepseek flash\n- worker session: /tmp/attach-child.jsonl\n- [ ] goal: attached goal\n\n## Log\n- previous progress kept\n");
+	f.ctx.ui.select.mockResolvedValueOnce("Previous supervisor confirmed stopped");
+	await f.command(`attach ${existing}`);
+	expect(f.entries.at(-1).data.mode).toBe("planning");
+	expect(f.entries.at(-1).data.plan).toBe(existing);
+	expect(f.messages.at(-1).message.content).toContain("without restarting completed work");
+	expect(f.messages.at(-1).message.content).toContain("/tmp/attach-child.jsonl");
+});
+
+it("attaches directly into solo mode and reports the recorded session in status", async () => {
+	const f = fixture();
+	const existing = join(f.ctx.cwd, "existing.md");
+	writeFileSync(existing, "# Plan\n- worker session: /tmp/attach-child.jsonl\n- [ ] goal: attached goal\n\n## Log\n");
+	f.ctx.ui.select.mockResolvedValueOnce("Worker confirmed stopped");
+	await f.command(`attach ${existing} solo`);
+	expect(f.entries.at(-1).data.mode).toBe("solo");
+	expect(f.entries.at(-1).data.worker?.sessionFile).toBe("/tmp/attach-child.jsonl");
+	await f.command("status");
+	expect(f.ctx.ui.notify).toHaveBeenLastCalledWith(expect.stringContaining("/tmp/attach-child.jsonl"), "info");
+});
+
+it("rejects attaching a missing or goal-less file", async () => {
+	const f = fixture();
+	await f.command("attach /no/such/plan.md");
+	expect(f.ctx.ui.notify).toHaveBeenLastCalledWith(expect.stringContaining("Cannot read plan"), "error");
+	const goalLess = join(f.ctx.cwd, "notes.md");
+	writeFileSync(goalLess, "# notes\n");
+	await f.command(`attach ${goalLess}`);
+	expect(f.ctx.ui.notify).toHaveBeenLastCalledWith(expect.stringContaining("has no '- [ ] goal:' lines"), "warning");
+	expect(f.entries).toEqual([]); // nothing saved: the session was not attached
+});
+
+it("exits planning with the draft preserved and nothing implemented", async () => {
+	const f = fixture(); await f.draft();
+	await f.command("stop");
+	expect(f.ctx.ui.notify).toHaveBeenLastCalledWith(expect.stringContaining("A draft cannot pause"), "warning");
+	const before = f.messages.length;
+	await f.command("exit");
+	expect(f.entries.at(-1).data.mode).toBe("chat");
+	expect(readFileSync(f.path, "utf8")).toContain("first output");
+	expect(f.messages.length).toBe(before); // notify only, no model turn started
+	f.ctx.ui.select.mockResolvedValueOnce("Previous supervisor confirmed stopped");
+	await f.command(`attach ${f.path}`);
+	expect(f.entries.at(-1).data.mode).toBe("planning");
+});
+
+it("records the preferred worker model as a visible plan preference", async () => {
+	const f = fixture(); await f.draft();
+	await f.command("model deepseek flash");
+	expect(readFileSync(f.path, "utf8")).toContain("- preferred worker model: deepseek flash");
+	await f.command("status");
+	expect(f.ctx.ui.notify).toHaveBeenLastCalledWith(expect.stringContaining("deepseek flash"), "info");
+});
+
+it.each(["solo", "attach"])("%s takeover cannot bypass confirmation or survive a lifecycle change during the menu", async kind => {
+	const f = fixture(); await f.draft(); await f.command("ready");
+	f.hooks.get("tool_result")({ toolName: "subagent", details: { id: "child", sessionFile: "/tmp/prior.jsonl" } });
+	let answer!: (choice: string) => void;
+	f.ctx.ui.select.mockImplementationOnce(() => new Promise(resolve => { answer = resolve; }));
+	const takeover = f.command(kind === "solo" ? "solo" : `attach ${f.path} solo`);
+	expect(f.entries.at(-1).data.mode).toBe("supervising");
+	await f.command("stop");
+	answer("Worker confirmed stopped"); await takeover;
+	expect(f.entries.at(-1).data.mode).toBe("paused");
+	expect(f.entries.at(-1).data.workerStopped).not.toBe(true);
+});
+
+it("attach solo requires stop confirmation for a noted worker even in a fresh session", async () => {
+	const f = fixture(); const path = join(f.ctx.cwd, "saved.md");
+	writeFileSync(path, `# Plan\n- worker session: /tmp/known.jsonl\n${f.plan}`);
+	f.ctx.ui.select.mockResolvedValueOnce("Cancel");
+	await f.command(`attach ${path} solo`);
+	expect(f.entries).toHaveLength(0);
+	f.ctx.ui.select.mockResolvedValueOnce("Worker confirmed stopped");
+	await f.command(`attach ${path} solo`);
+	expect(f.entries.at(-1).data).toMatchObject({ mode: "solo", workerStopped: true, worker: { sessionFile: "/tmp/known.jsonl" } });
+	expect(readFileSync(path, "utf8")).toContain("worker session: /tmp/known.jsonl");
+});
+
+it("retains the stopped session reference without permanently blocking another plan", async () => {
+	const f = fixture(); await f.draft(); await f.command("ready");
+	f.hooks.get("tool_result")({ toolName: "subagent", details: { id: "child", sessionFile: "/tmp/prior.jsonl" } });
+	f.ctx.ui.select.mockResolvedValueOnce("Worker confirmed stopped"); await f.command("solo");
+	const other = join(f.ctx.cwd, "another.md"); writeFileSync(other, "- [ ] goal: next\n## Log\n");
+	f.ctx.ui.select.mockResolvedValueOnce("Previous supervisor confirmed stopped");
+	await f.command(`attach ${other}`);
+	expect(f.entries.at(-1).data).toMatchObject({ mode: "planning", plan: other, workerStopped: true, worker: { sessionFile: "/tmp/prior.jsonl" } });
+	await f.command("ready");
+	f.hooks.get("tool_call")({ toolName: "subagent_resume" });
+	expect(f.entries.at(-1).data.workerStopped).toBe(false);
+	await f.command("solo");
+	expect(f.ctx.ui.notify).toHaveBeenLastCalledWith(expect.stringContaining("still pending"), "warning");
+});
+
+it("solo closes a pending plan watcher and sends removal-only scheduler guidance", async () => {
+	const f = fixture(); await f.draft(); await f.command("ready");
+	await f.atomicWrite(f.plan.replace("first output", "changed output"));
+	f.ctx.ui.select.mockResolvedValueOnce("Worker confirmed stopped"); await f.command("solo");
+	expect(f.messages.at(-1).message.content).toContain('job named "goals-copy-only" bound to session "copy-only"');
+	expect(f.messages.at(-1).message.content).toContain("Do not add, enable or recreate any job");
+	await delay(250);
+	await f.atomicWrite(f.plan.replace("first output", "solo output"));
+	await delay(250);
+	expect(f.changed()).toBe(0);
+});
+
+it.each(["missing", "empty", "directory"])("%s plan snapshots never erase signoffs and resync retries after repair", async failure => {
+	const f = fixture(); await f.draft(); await f.command("ready");
+	writeFileSync(join(f.ctx.cwd, "proof.log"), "PASS\n");
+	await f.tools.get("CompleteGoal").execute("c", { goal: "first output", evidence: ["proof.log"], observation: "Observed PASS" }, undefined, undefined, f.ctx);
+	const signed = readFileSync(f.path, "utf8");
+	if (failure === "empty") writeFileSync(f.path, "");
+	else { rmSync(f.path); if (failure === "directory") mkdirSync(f.path); }
+	await delay(250); // also exercise unavailable read after debounce has expired
+	f.hooks.get("agent_end")({}, f.ctx);
+	expect(f.entries.at(-1).data.signoffs["first output"]).toBeDefined();
+	f.hooks.get("session_compact")();
+	const unavailable = f.hooks.get("before_agent_start")({ systemPrompt: "base" }, f.ctx);
+	expect(unavailable.systemPrompt).toContain("unavailable");
+	expect(unavailable.message).toBeUndefined();
+	if (failure === "directory") rmSync(f.path, { recursive: true });
+	writeFileSync(f.path, signed);
+	const resync = f.hooks.get("before_agent_start")({ systemPrompt: "base" }, f.ctx);
+	expect(resync.message.content).toContain("Observed PASS");
+	await delay(250);
+	expect(f.entries.at(-1).data.signoffs["first output"]).toBeDefined();
+	expect(f.changed()).toBe(0);
+});
+
+it("ignores post-completion maintenance but reviews evidence, requirement or manual reopening changes", async () => {
+	const f = fixture(); await f.draft(); await f.command("ready");
+	writeFileSync(join(f.ctx.cwd, "proof.log"), "PASS\n");
+	for (const goal of ["first output", "second output"]) await f.tools.get("CompleteGoal").execute("c", { goal, evidence: ["proof.log"], observation: "PASS" }, undefined, undefined, f.ctx);
+	const signed = readFileSync(f.path, "utf8");
+	await f.atomicWrite(signed.replace("## Log", "## Log\n- recap: finished"));
+	await delay(250);
+	expect(f.changed()).toBe(0); // Log-only edits are history, not requirements
+	// Worker-authored evidence above the Log must surface: a supervisor caught a worker's
+	// contradictory evidence block through exactly this event (LUCID3, 2026-09-10).
+	await f.atomicWrite(signed.replace("## Log", "  - evidence: proof.log\n## Log\n- recap: finished"));
+	await waitFor(() => f.changed() === 1);
+	await f.atomicWrite(signed.replace("## Log", "- discriminator: exact bytes and trailing newline\n## Log"));
+	await waitFor(() => f.changed() === 2);
+	await f.atomicWrite(signed.replace("[x] goal: first", "[ ] goal: first"));
+	await waitFor(() => f.changed() === 3);
+	expect(f.entries.at(-1).data.signoffs["first output"]).toBeUndefined();
+});
+
+it("cancelled goals do not prevent final cleanup, and solo writes self-verification in Log", async () => {
+	const f = fixture(); await f.draft();
+	writeFileSync(f.path, f.plan.replace("[ ] goal: second", "[-] goal: second") + "\n## Appendix\nPreserved context\n");
+	f.ctx.ui.select.mockResolvedValueOnce("Worker confirmed stopped"); await f.command("solo");
+	writeFileSync(join(f.ctx.cwd, "proof.log"), "PASS\n");
+	const done = await f.tools.get("CompleteGoal").execute("c", { goal: "first output", evidence: ["proof.log"], observation: "Exact bytes observed" }, undefined, undefined, f.ctx);
+	expect(done.content[0].text).toContain("All non-cancelled goals are reviewed");
+	const text = readFileSync(f.path, "utf8");
+	expect(text).toContain("Solo self-verification:");
+	expect(text).not.toContain("Parent review:");
+	expect(text.indexOf("Solo self-verification:")).toBeLessThan(text.indexOf("## Appendix"));
+	expect(text).toContain("Preserved context");
+});
+
+it("lineage-only child attaches its plan with goal-only widget, retains task context, and cannot complete", async () => {
+	const f = fixture(true);
+	const supplied = join(f.ctx.cwd, "supplied.md");
+	const text = "- [/] goal: exact file\n  - [ ] verify bytes\n## Log\n  - [ ] archived task\n";
+	writeFileSync(supplied, text);
+	const before = f.hooks.get("before_agent_start")({ systemPrompt: "base" }, f.ctx);
+	expect(before.systemPrompt).toContain("AttachGoalPlan");
+	const attach = f.tools.get("AttachGoalPlan");
+	await attach.execute("a", { path: "supplied.md" }, undefined, undefined, f.ctx);
+	expect(f.entries.at(-1).data.plan).toBeUndefined(); // no cwd heuristics
+	await attach.execute("a", { path: supplied }, undefined, undefined, f.ctx);
+	expect(f.ctx.ui.setWidget.mock.lastCall?.[1]).toEqual(["▸ exact file"]);
+	expect(f.ctx.ui.setWidget.mock.lastCall?.[1].join("\n")).not.toContain("archived task");
+	expect(readFileSync(supplied, "utf8")).toBe(text);
+	f.hooks.get("session_start")({}, f.ctx);
+	expect(f.hooks.get("before_agent_start")({ systemPrompt: "base" }, f.ctx).message.content).toContain("exact file");
+	const completion = await f.tools.get("CompleteGoal").execute("c", { goal: "exact file", evidence: [], observation: "claim" }, undefined, undefined, f.ctx);
+	expect(completion.content[0].text).toContain("only to the active parent");
+});
+
+it.each(["solo", "supervising"])("%s widget omits long tasks without altering the plan", async mode => {
+	const f = fixture(); await f.draft();
+	const text = "- [/] goal: first output\n  - [ ] a long task that should never take widget space\n- [ ] goal: second output\n## Log\n";
+	writeFileSync(f.path, text);
+	if (mode === "solo") { f.ctx.ui.select.mockResolvedValueOnce("Worker confirmed stopped"); await f.command("solo"); }
+	else await f.command("ready");
+	expect(f.ctx.ui.setWidget.mock.lastCall?.[1]).toEqual(["▸ first output", "○ second output"]);
+	expect(readFileSync(f.path, "utf8")).toBe(text);
+});
+
+it.each(["solo", "supervising"])("%s upkeep is turn-driven, folds Log, resets on working-set edits, and never starts a turn", async mode => {
+	const f = fixture(); await f.draft();
+	if (mode === "solo") { f.ctx.ui.select.mockResolvedValueOnce("Worker confirmed stopped"); await f.command("solo"); }
+	else await f.command("ready");
+	f.hooks.get("before_agent_start")({ systemPrompt: "base" }, f.ctx);
+	const reminders = () => f.messages.filter(m => m.message.customType === "pi-goals-upkeep");
+	f.hooks.get("turn_end")({}, f.ctx); // observe initial working set
+	for (let i = 0; i < 7; i++) {
+		writeFileSync(f.path, f.plan + `- historical recap ${i}\n`);
+		f.hooks.get("turn_end")({}, f.ctx);
+	}
+	expect(reminders()).toHaveLength(0);
+	f.hooks.get("turn_end")({}, f.ctx);
+	expect(reminders()).toHaveLength(1);
+	expect(reminders()[0].options).toEqual({ triggerTurn: false });
+	expect(reminders()[0].message.content).toContain(f.path);
+	expect(reminders()[0].message.content).not.toContain("first output");
+	for (let i = 0; i < 16; i++) f.hooks.get("turn_end")({}, f.ctx);
+	expect(reminders()).toHaveLength(1);
+	expect(reminders()[0].message.content).not.toContain("historical recap");
+	for (let i = 0; i < 7; i++) f.hooks.get("turn_end")({}, f.ctx);
+	writeFileSync(f.path, f.plan.replace("first output", "refined output"));
+	f.hooks.get("turn_end")({}, f.ctx);
+	expect(reminders()).toHaveLength(1);
+	await f.command("stop");
+	for (let i = 0; i < 10; i++) f.hooks.get("turn_end")({}, f.ctx);
+	expect(reminders()).toHaveLength(1);
+});
+
+it("extra subagent launches are recorded as helpers and never steal the implementation identity", async () => {
+	const f = fixture(); await f.draft(); await f.command("ready");
+	f.hooks.get("tool_result")({ toolName: "subagent", details: { id: "impl", sessionFile: "/tmp/impl.jsonl" } });
+	expect(f.entries.at(-1).data).toMatchObject({ worker: { id: "impl", sessionFile: "/tmp/impl.jsonl" }, helpers: [] });
+	f.hooks.get("tool_result")({ toolName: "subagent", details: { id: "reviewer", sessionFile: "/tmp/review.jsonl" } });
+	expect(f.entries.at(-1).data).toMatchObject({ worker: { id: "impl" }, helpers: [{ id: "reviewer", sessionFile: "/tmp/review.jsonl" }] });
+	// a repeated helper launch updates its record instead of duplicating it
+	f.hooks.get("tool_result")({ toolName: "subagent", details: { id: "reviewer-2", sessionFile: "/tmp/review.jsonl" } });
+	expect(f.entries.at(-1).data.helpers).toEqual([{ id: "reviewer-2", sessionFile: "/tmp/review.jsonl" }]);
+	// resuming the worker keeps the binding and refreshes its id
+	f.hooks.get("tool_result")({ toolName: "subagent_resume", details: { id: "impl-2", sessionFile: "/tmp/impl.jsonl" } });
+	expect(f.entries.at(-1).data).toMatchObject({ worker: { id: "impl-2", sessionFile: "/tmp/impl.jsonl" }, helpers: [{ id: "reviewer-2" }] });
+});
+
+it("pending launch counter survives concurrent launches until every result lands", async () => {
+	const f = fixture(); await f.draft(); await f.command("ready");
+	f.hooks.get("tool_call")({ toolName: "subagent" });
+	f.hooks.get("tool_call")({ toolName: "subagent" });
+	f.hooks.get("tool_result")({ toolName: "subagent", details: { id: "a", sessionFile: "/tmp/a.jsonl" } });
+	f.ctx.ui.select.mockResolvedValueOnce("Worker confirmed stopped");
+	await f.command("solo");
+	expect(f.entries.at(-1).data.mode).toBe("supervising"); // one launch still pending
+	expect(f.ctx.notify ?? f.ctx.ui.notify).toHaveBeenLastCalledWith(expect.stringContaining("still pending"), "warning");
+	f.hooks.get("tool_result")({ toolName: "subagent", details: { id: "b", sessionFile: "/tmp/b.jsonl" } });
+	f.ctx.ui.select.mockResolvedValueOnce("Worker confirmed stopped");
+	await f.command("solo");
+	expect(f.entries.at(-1).data.mode).toBe("solo");
+	expect(f.entries.at(-1).data).toMatchObject({ worker: { id: "a" }, helpers: [{ id: "b" }] });
+});
+
+it("late worker results invalidate a takeover menu but do not disable plan watching", async () => {
+	const f = fixture(); await f.draft(); await f.command("ready");
+	let answer!: (choice: string) => void;
+	f.ctx.ui.select.mockImplementationOnce(() => new Promise(resolve => { answer = resolve; }));
+	const solo = f.command("solo");
+	f.hooks.get("tool_result")({ toolName: "subagent", details: { id: "late-child", sessionFile: "/tmp/late.jsonl" } });
+	answer("Worker confirmed stopped"); await solo;
+	expect(f.entries.at(-1).data.mode).toBe("supervising");
+	expect(f.entries.at(-1).data.workerStopped).toBe(false);
+	await f.atomicWrite(f.plan.replace("first output", "new requirement"));
+	await waitFor(() => f.changed() === 1);
+});
+
+it("changed plan or shutdown during takeover never grants solo permission", async () => {
+	const f = fixture(); await f.draft();
+	f.ctx.ui.select.mockImplementationOnce(async () => { writeFileSync(f.path, f.plan.replace("first", "changed")); return "Worker confirmed stopped"; });
+	await f.command("solo");
+	expect(f.entries.at(-1).data.mode).toBe("planning");
+	expect(f.ctx.ui.notify).toHaveBeenLastCalledWith(expect.stringContaining("Plan changed during takeover"), "warning");
+	f.ctx.ui.select.mockImplementationOnce(async () => { f.shutdown(); return "Worker confirmed stopped"; });
+	await f.command("solo");
+	expect(f.entries.at(-1).data.mode).toBe("planning");
+});
+
+it("requires explicit supervisor ownership confirmation when attaching an existing plan", async () => {
+	const f = fixture(); const path = join(f.ctx.cwd, "shared.md");
+	writeFileSync(path, f.plan);
+	f.ctx.ui.select.mockResolvedValueOnce("Cancel");
+	await f.command(`attach ${path}`);
+	expect(f.entries).toHaveLength(0);
+	f.ctx.ui.select.mockResolvedValueOnce("Previous supervisor confirmed stopped");
+	await f.command(`attach ${path}`);
+	expect(f.entries.at(-1).data).toMatchObject({ mode: "planning", plan: path });
+});
+
+it("does not approve cancelled goals or display current completion for an unavailable plan", async () => {
+	const f = fixture(); await f.draft(); await f.command("ready");
+	writeFileSync(f.path, "- [-] goal: cancelled output\n## Log\n");
+	writeFileSync(join(f.ctx.cwd, "evidence.log"), "verified\n");
+	const reply = await f.tools.get("CompleteGoal").execute("t", { goal: "cancelled output", evidence: ["evidence.log"], observation: "read" }, undefined, undefined, f.ctx);
+	expect(reply.content[0].text).toContain("no sign-off recorded");
+	expect(readFileSync(f.path, "utf8")).toContain("[-]");
+	rmSync(f.path);
+	f.hooks.get("agent_end")({}, f.ctx);
+	expect(f.ctx.ui.setWidget).toHaveBeenLastCalledWith("goals", [expect.stringContaining("unavailable")]);
+});
+
+it("uses scheduler storage for ownership and the real public user controls", () => {
+	const prompt = scheduleCheckIn("session-1", "/plan.md");
+	expect(prompt).toContain(".pi/schedule-prompts.json");
+	expect(prompt).toContain("tool text does not expose binding");
+	expect(prompt).toContain("Never use cleanup");
+	expect(prompt).toContain("deletes disabled jobs");
+	expect(prompt).toContain("schedule_prompt update");
+	expect(prompt).not.toContain("with /schedule-prompts");
+});
+
+it("keeps interactive workers open and supplies the supervisor identity for Intercom reports", async () => {
+	const agent = readFileSync(new URL("../agents/goals-worker.md", import.meta.url), "utf8");
+	expect(agent).toContain("auto-exit: false");
+	const f = fixture(); await f.draft(); await f.command("ready");
+	expect(f.messages.at(-1).message.content).toContain("supervisor Intercom session copy-only");
+	const role = f.hooks.get("before_agent_start")({ systemPrompt: "base" }, f.ctx).systemPrompt;
+	expect(role).toContain("your Intercom session ID copy-only");
+	expect(role).toContain("stop workers before /reload");
+	expect(role).not.toContain("Reports arrive automatically");
+});

test/herdr.test.ts

@@ -1,64 +0,0 @@
-import { chmodSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { afterEach, describe, expect, it, vi } from "vitest";
-import { closeSupervisorPane, openSupervisorPane, supervisorCommand } from "../src/herdr.js";
-
-function input() {
-	return {
-		cwd: "/repo",
-		sourceSessionFile: "/sessions/worker.jsonl",
-		workerSessionId: "worker-12345678",
-		workerIntercomId: "intercom-12345678",
-		planPath: "/repo/.pi/plan/worker-v1.md",
-		approvalId: "approval-1",
-		extensionPath: "/repo/src/index.ts",
-		superviseExtensionPath: null,
-		model: "provider/supervisor",
-	};
-}
-
-afterEach(() => vi.unstubAllEnvs());
-
-describe("supervisor pane command", () => {
-	it("forks the planning session with an explicit supervisor role and model", () => {
-		const command = supervisorCommand(input());
-		expect(command).toContain("'PI_GOALS_ROLE=supervisor'");
-		expect(command).toContain("'PI_GOALS_WORKER_INTERCOM_ID=intercom-12345678'");
-		expect(command).toContain("'pi' '--no-extensions' '-e' 'npm:pi-intercom' '-e' 'npm:@wassname2/pi-supervise@0.0.4' '-e' '/repo/src/index.ts'");
-		expect(command).toContain("'--fork' '/sessions/worker.jsonl'");
-		expect(command).toContain("'--model' 'provider/supervisor'");
-		expect(command).not.toContain("Initialize supervision startup.");
-		expect(command).not.toContain("pi-subagents");
-	});
-
-	it("uses the loaded pi-supervise extension before the npm fallback", () => {
-		const loaded = { ...input(), superviseExtensionPath: "/repo/vendor/pi-supervise/src/index.ts" };
-		expect(supervisorCommand(loaded)).toContain("'-e' '/repo/vendor/pi-supervise/src/index.ts'");
-		vi.stubEnv("PI_GOALS_SUPERVISE_EXTENSION", "/repo/override/pi-supervise/src/index.ts");
-		expect(supervisorCommand(loaded)).toContain("'-e' '/repo/override/pi-supervise/src/index.ts'");
-	});
-
-	it("accepts Herdr's text version output and stale pane cleanup", async () => {
-		const cwd = mkdtempSync(join(tmpdir(), "pi-goals-herdr-"));
-		const bin = join(cwd, "herdr");
-		writeFileSync(bin, `#!/bin/sh
-if [ "$1" = "--version" ]; then echo "herdr 0.8.2"; exit 0; fi
-if [ "$1" = "pane" ] && [ "$2" = "split" ]; then echo '{"pane_id":"new-pane"}'; exit 0; fi
-if [ "$1" = "pane" ] && [ "$2" = "run" ]; then if [ "$HERDR_SMOKE_RUN_FAIL" = "1" ]; then echo "run failed" >&2; exit 1; fi; echo '{}'; exit 0; fi
-if [ "$1" = "pane" ] && [ "$2" = "close" ]; then echo '{"error":{"code":"PANE_GONE"}}' >&2; exit 1; fi
-exit 2
-`);
-		chmodSync(bin, 0o755);
-		vi.stubEnv("HERDR_ENV", "1");
-		vi.stubEnv("HERDR_BIN_PATH", bin);
-		try {
-			await expect(openSupervisorPane(input())).resolves.toBe("new-pane");
-			await expect(closeSupervisorPane("new-pane")).resolves.toBeUndefined();
-			vi.stubEnv("HERDR_SMOKE_RUN_FAIL", "1");
-			await expect(openSupervisorPane(input())).rejects.toThrow("run failed");
-		} finally {
-			rmSync(cwd, { recursive: true, force: true });
-		}
-	});
-});

test/package-agent.test.ts

@@ -1,18 +0,0 @@
-import { readFileSync } from "node:fs";
-import { resolve } from "node:path";
-import { describe, expect, it } from "vitest";
-
-interface PackageManifest {
-	files: string[];
-	pi: { extensions: string[]; subagents?: unknown };
-}
-
-describe("package manifest", () => {
-	it("includes the extension without registering a packaged subagent", () => {
-		const root = resolve(import.meta.dirname, "..");
-		const manifest = JSON.parse(readFileSync(resolve(root, "package.json"), "utf8")) as PackageManifest;
-		expect(manifest.files).toEqual(["src", "README.md"]);
-		expect(manifest.pi.extensions).toEqual(["./src/index.ts"]);
-		expect(manifest.pi.subagents).toBeUndefined();
-	});
-});

test/package.test.ts

@@ -0,0 +1,15 @@
+import { existsSync, readFileSync } from "node:fs";
+import { resolve } from "node:path";
+import { expect, it } from "vitest";
+
+it("declares current entry and bundled extension resources that exist after install", () => {
+	const manifest = JSON.parse(readFileSync("package.json", "utf8"));
+	expect(manifest.pi.extensions[0]).toBe("./src/index.ts");
+	for (const path of manifest.pi.extensions) expect(existsSync(resolve(path)), path).toBe(true);
+	for (const name of ["pi-subagents", "pi-intercom", "pi-schedule-prompt"]) {
+		expect(manifest.dependencies[name]).toBeTruthy();
+		expect(manifest.bundledDependencies).toContain(name);
+	}
+	expect(manifest.dependencies["pi-subagents"]).toContain("953c6f6d2fc7d8a5c956c30cd77c51bad697c2a4");
+	expect(existsSync("agents/goals-worker.md")).toBe(true);
+});

test/plan-view.test.ts

@@ -0,0 +1,40 @@
+import { expect, it } from "vitest";
+import { planViews } from "../src/plan-view.js";
+
+it("keeps outcome, preferences and discriminators without tasks or history", () => {
+	const plan = "# Outcome\nBeat random, not just plot it.\n## User preferences\nKeep costs low.\n## Goals\n1. [ ] goal: repair\n  - discriminator: beats random\n  - subtle failure mode: plot exists but result fails\n  - tasks:\n    1. [x] draw plot\n  - evidence:\n    - old output\n2. [ ] goal: confirm\n## Task list\n- [ ] run it\n## Appendix\nunapproved idea";
+	const views = planViews(plan);
+	for (const text of ["Beat random", "Keep costs low", "goal: repair", "discriminator: beats random", "subtle failure mode", "goal: confirm"]) expect(views.short).toContain(text);
+	for (const text of ["draw plot", "old output", "run it", "unapproved idea"]) expect(views.short).not.toContain(text);
+	expect(views.long).toContain("draw plot");
+	expect(views.long).toContain("old output");
+	expect(views.long).not.toContain("unapproved idea");
+});
+
+it("omits only named worker identity fields from review while retaining them in full context", () => {
+	const base = "# Plan\n- preferred worker model: provider/model\n- [ ] goal: result\n  - discriminator: exact bytes";
+	const metadata = "\n- Active worker: worker-1\n- worker session: /saved.jsonl\n- worker intercom session: uuid";
+	expect(planViews(base + metadata).short).toBe(planViews(base).short);
+	expect(planViews(base + metadata).long).toContain("/saved.jsonl");
+	expect(planViews(base.replace("exact bytes", "approximate match")).short).not.toBe(planViews(base).short);
+	expect(planViews(base.replace("[ ]", "[x]")).short).not.toBe(planViews(base).short);
+});
+
+it("notifies on goal and task changes but not on identity bookkeeping or log edits", () => {
+	const base = "# Plan\n- [ ] goal: result\n## Task list\n- [ ] run it\n- worker session: /saved.jsonl\n## Log\nfirst entry";
+	const baseView = planViews(base).notify;
+	// identity bookkeeping: silent
+	expect(planViews(base.replace("/saved.jsonl", "/moved.jsonl")).notify).toBe(baseView);
+	// log edits: silent
+	expect(planViews(base.replace("first entry", "second entry")).notify).toBe(baseView);
+	// worker ticking a task: review event (field catch, LUCID3 2026-09-10)
+	expect(planViews(base.replace("- [ ] run it", "- [x] run it")).notify).not.toBe(baseView);
+	// goal edits: review event
+	expect(planViews(base.replace("[ ] goal: result", "[x] goal: result")).notify).not.toBe(baseView);
+});
+
+it("stops at history and preserves a manual goal tick", () => {
+	const view = planViews("# Plan\n1. [x] goal: result\n## Log\n1. [ ] goal: historical");
+	expect(view.short).toContain("[x] goal: result");
+	expect(view.long).not.toContain("historical");
+});

test/prompts.test.ts

@@ -1,31 +1,21 @@
 import { describe, expect, it } from "vitest";
-import { completeGoalDescription, planDrafting, planningState, resync } from "../src/prompts.js";
+import { planDrafting } from "../src/prompts.js";
 
 describe("planning prompt", () => {
 	it("requires fact finding or a focused question before a goal", () => {
 		expect(planDrafting).toContain("Use read-only repository tools or web search when either can\nresolve a fact.");
-		expect(planDrafting).toContain("Ask at least three short, concrete questions");
-		expect(planDrafting).toContain("understand the requested outcome, boundary, and how success will be judged");
-		expect(planDrafting).toContain("record that\npoint as unknown; do not silently replace it with an inference");
+		expect(planDrafting).toContain("Do not use a question quota");
+		expect(planDrafting).toContain("Briefly reframe the request in your own words to check comprehension");
+		expect(planDrafting).toContain("point as unknown; do not silently replace it with an inference or turn it into a new blocking decision");
 		expect(planDrafting).toContain("answer materially reduces uncertainty\nwhile discovering the right plan");
 		expect(planDrafting).toContain("self-contained: state the relevant\ncontext, use the human's language and ASD-STE100");
 		expect(planDrafting).toContain("placeholder goal such as \"work out the thing\"");
-		expect(planDrafting).toContain("material user decisions remain open");
-	});
-
-	it("restores the same rule after compaction", () => {
-		expect(planningState(".pi/plan/test.md")).toContain("web search\nwhen either can resolve a fact.");
-		expect(planningState(".pi/plan/test.md")).toContain("choice that needs their approval");
-		expect(planningState(".pi/plan/test.md")).toContain("self-contained round with relevant context and a recommendation");
+		expect(planDrafting).toContain("Only withhold Ready for an unanswered choice that changes scope, spending, or the user-visible result");
 	});
 
 	it("anchors work and sign-off to the user-visible result", () => {
 		expect(planDrafting).toContain("## User-visible result");
 		expect(planDrafting).toContain("Take it from the original request, not from your implementation plan");
 		expect(planDrafting).toContain("Future work may not defer any artifact or action named there");
-		expect(resync("plan", ".pi/plan/test.md", "Compacted.")).toContain("amend the plan rather than preserving an obsolete decision");
-		expect(resync("plan", ".pi/plan/test.md", "Compacted.")).toContain("implementation worker");
-		expect(completeGoalDescription).toContain("visible supervisor");
-		expect(completeGoalDescription).toContain("stopped worker view with no active work");
 	});
 });

test/rpc-review.test.ts

@@ -1,5 +1,6 @@
 import { type ChildProcessWithoutNullStreams, spawn } from "node:child_process";
-import { mkdtempSync, rmSync } from "node:fs";
+import { once } from "node:events";
+import { mkdtempSync, readFileSync, rmSync } from "node:fs";
 import { createServer } from "node:http";
 import { tmpdir } from "node:os";
 import { join, resolve } from "node:path";
@@ -7,14 +8,17 @@ import { StringDecoder } from "node:string_decoder";
 import { describe, expect, it } from "vitest";
 
 type RpcMessage = { type: string; id?: string; method?: string; [key: string]: unknown };
+type ModelRequest = { messages: Array<{ role: string; content: unknown }> };
 
 class RpcClient {
 	readonly messages: RpcMessage[] = [];
+	stderr = "";
 	private readonly waiters: Array<{ predicate: (message: RpcMessage) => boolean; resolve: (message: RpcMessage) => void }> = [];
 
 	constructor(readonly process: ChildProcessWithoutNullStreams) {
 		const decoder = new StringDecoder("utf8");
 		let buffer = "";
+		process.stderr.on("data", (chunk) => { this.stderr += chunk; });
 		process.stdout.on("data", (chunk) => {
 			buffer += decoder.write(chunk);
 			while (buffer.includes("\n")) {
@@ -37,7 +41,14 @@ class RpcClient {
 	waitFor(predicate: (message: RpcMessage) => boolean, after = 0): Promise<RpcMessage> {
 		const existing = this.messages.slice(after).find(predicate);
 		if (existing) return Promise.resolve(existing);
-		return new Promise((resolvePromise) => this.waiters.push({ predicate, resolve: resolvePromise }));
+		return new Promise((resolvePromise, reject) => {
+			const timer = setTimeout(() => {
+				this.waiters.splice(this.waiters.indexOf(waiter), 1);
+				reject(new Error(`RPC wait timed out: ${this.stderr}\n${JSON.stringify(this.messages.slice(-12))}`));
+			}, 8_000);
+			const waiter = { predicate, resolve: (message: RpcMessage) => { clearTimeout(timer); resolvePromise(message); } };
+			this.waiters.push(waiter);
+		});
 	}
 }
 
@@ -48,69 +59,108 @@ function streamResponse(response: import("node:http").ServerResponse, delta: obj
 	response.end("data: [DONE]\n\n");
 }
 
+const isSelect = (message: RpcMessage) => message.type === "extension_ui_request" && message.method === "select";
+const isEditor = (message: RpcMessage) => message.type === "extension_ui_request" && message.method === "editor";
+const systemText = (request: ModelRequest) => request.messages.filter(message => ["system", "developer"].includes(message.role)).map(message => message.content).join("\n");
+
 describe("RPC review flow", () => {
-	it("opens Refine's editor before it starts the revision turn", async () => {
+	it.each(["Edit", "Discuss"])("automatically proposes a draft, handles %s, then enters the supervisor role on Ready", async (choice) => {
 		const cwd = mkdtempSync(join(tmpdir(), "pi-goals-rpc-"));
-		let requestCount = 0;
+		const requests: ModelRequest[] = [];
+		const plan = "# Plan\n\n## Goals\n\n1. [ ] goal: name the output\n  - subtle failure mode: the output has no name\n  - discriminator: the plan names the output\n\n## Log\n";
 		let planPath = "";
-		const server = createServer((_request, response) => {
-			requestCount++;
-			if (requestCount === 1) {
+		const server = createServer(async (request, response) => {
+			let body = "";
+			for await (const chunk of request) body += chunk;
+			requests.push(JSON.parse(body));
+			if (requests.length === 1) {
 				streamResponse(response, {
 					tool_calls: [{
-						index: 0,
-						id: "write-plan",
-						type: "function",
-						function: {
-							name: "write",
-							arguments: JSON.stringify({
-								path: planPath,
-								content: "# Plan\n\n## Goals\n\n1. [ ] goal: name the output\n  - subtle failure mode: the output has no name\n  - discriminator: the plan names the output\n\n## Log\n\n## Interview\n",
-							}),
-						},
+						index: 0, id: "write-plan", type: "function",
+						function: { name: "write", arguments: JSON.stringify({ path: planPath, content: plan }) },
 					}],
 				}, "tool_calls");
 				return;
 			}
-			streamResponse(response, { content: "Plan drafted." }, "stop");
+			streamResponse(response, { content: "Plan inspected." }, "stop");
 		});
-		await new Promise<void>((resolvePromise) => server.listen(0, "127.0.0.1", resolvePromise));
+		await new Promise<void>((done) => server.listen(0, "127.0.0.1", done));
 		const address = server.address();
 		if (!address || typeof address === "string") throw new Error("Offline model did not bind a TCP port.");
 
 		const pi = spawn(resolve("node_modules/.bin/pi"), [
-			"--mode", "rpc", "--no-session", "--model", "offline/test",
+			"--mode", "rpc", "--no-session", "--no-extensions", "--model", "offline/test",
 			"-e", resolve("test/fixtures/offline-model.ts"),
+			"-e", resolve("test/fixtures/subagent-schema.ts"),
 			"-e", resolve("src/index.ts"),
 		], {
 			cwd,
 			env: {
-				...process.env,
+				// Pi/gpt-6-astra: test the parent role even when vitest itself runs in a worker.
+				...Object.fromEntries(Object.entries(process.env).filter(([name]) => !name.startsWith("PI_SUBAGENT_") && !name.startsWith("PI_GOALS_"))),
 				PI_CODING_AGENT_DIR: join(cwd, ".agent"),
 				PI_GOALS_OFFLINE_MODEL_URL: `http://127.0.0.1:${address.port}`,
 			},
 		});
 		const client = new RpcClient(pi);
+		const exited = once(pi, "exit");
 		try {
 			client.send({ type: "get_state", id: "state" });
 			const state = await client.waitFor((message) => message.type === "response" && message.id === "state");
 			const sessionId = (state.data as { sessionId: string }).sessionId;
-			planPath = join(cwd, ".pi", "plan", `${sessionId}-v1.md`);
+			planPath = join(cwd, ".pi", "plan", `${sessionId}-main.md`);
 
-			client.send({ type: "prompt", id: "goals", message: "/goals work out the thing" });
-			const review = await client.waitFor((message) => message.type === "extension_ui_request" && message.method === "select");
-			client.send({ type: "extension_ui_response", id: review.id, value: "Refine" });
-			const editor = await client.waitFor((message) => message.type === "extension_ui_request" && message.method === "editor");
-			expect(requestCount).toBe(2);
+			client.send({ type: "prompt", id: "goals", message: "/goals new work out the thing" });
+			const review = await client.waitFor(isSelect);
+			expect(review.options).toEqual(["Ready", "Discuss", "Edit", "Cancel"]);
+			expect(review.title).toContain(planPath);
+			const proposal = client.messages.find(message => message.type === "message_end" && (message.message as { customType?: string })?.customType === "goal-plan-proposal");
+			expect(proposal?.message).toMatchObject({ content: plan, display: true });
+			expect(readFileSync(planPath, "utf8")).toBe(plan);
+			expect(requests).toHaveLength(2);
+			expect(systemText(requests[0])).toContain("Plan only in");
 
-			const revisionStart = client.messages.length;
-			client.send({ type: "extension_ui_response", id: editor.id, value: "Name the produced file." });
-			await client.waitFor((message) => message.type === "agent_end", revisionStart);
-			expect(requestCount).toBe(3);
+			const choiceStart = client.messages.length;
+			client.send({ type: "extension_ui_response", id: review.id, value: choice });
+			let approvedPlan = plan;
+			if (choice === "Edit") {
+				const editor = await client.waitFor(isEditor, choiceStart);
+				expect(editor.prefill).toBe(plan);
+				expect(requests).toHaveLength(2);
+				approvedPlan = plan.replace("the plan names the output", "the plan names output.txt and its exact bytes");
+				const editStart = client.messages.length;
+				client.send({ type: "extension_ui_response", id: editor.id, value: approvedPlan });
+				await client.waitFor(message => message.type === "extension_ui_request" && message.method === "setWidget", editStart);
+				expect(readFileSync(planPath, "utf8")).toBe(approvedPlan);
+				expect(requests).toHaveLength(2);
+			} else {
+				await client.waitFor(message => message.type === "agent_end", choiceStart);
+				expect(requests).toHaveLength(3);
+				expect(systemText(requests[2])).toContain("Plan only in");
+				expect(JSON.stringify(requests[2].messages.at(-1))).toContain("Discuss the current draft");
+				expect(client.messages.slice(choiceStart).filter(isEditor)).toEqual([]);
+			}
+			const beforeReady = requests.length;
+			const reopenStart = client.messages.length;
+			client.send({ type: "prompt", id: "review", message: "/goals review" });
+			const ready = await client.waitFor(isSelect, reopenStart);
+			expect(requests).toHaveLength(beforeReady);
+			const readyStart = client.messages.length;
+			client.send({ type: "extension_ui_response", id: ready.id, value: "Ready" });
+			await client.waitFor(message => message.type === "agent_end", readyStart);
+			expect(requests).toHaveLength(beforeReady + 1);
+			const supervisor = requests.at(-1)!;
+			expect(systemText(supervisor)).toContain("You are the goal supervisor in the main chat");
+			expect(systemText(supervisor)).not.toContain("Plan only in");
+			expect(JSON.stringify(supervisor.messages)).toContain(JSON.stringify(approvedPlan).slice(1, -1));
+			expect(client.messages.filter(message => message.type === "tool_execution_start").map(message => message.toolName)).toEqual(["write"]);
+			expect(client.messages.filter(message => message.type === "extension_error")).toEqual([]);
+			console.log(`RPC ${choice}: visible automatic proposal; ${choice === "Edit" ? "editor saved exact plan without model call" : "discussion retained planning role without editor"}; Ready request used supervisor role; only write executed.`);
 		} finally {
 			pi.kill();
-			server.close();
+			await exited;
+			await new Promise<void>((done) => server.close(() => done()));
 			rmSync(cwd, { recursive: true, force: true });
 		}
-	}, 15_000);
+	}, 25_000);
 });

test/session-usage.test.ts

@@ -0,0 +1,34 @@
+import { expect, it } from "vitest";
+import { report, summarize } from "../scripts/session-usage.mjs";
+
+const start = "2026-09-10T06:00:00.000Z";
+const end = "2026-09-10T07:00:00.000Z";
+const request = (timestamp: string, model = "a") => ({
+	type: "message", timestamp, message: { role: "assistant", provider: "test", model,
+		usage: { input: 10, cacheRead: 100, cacheWrite: 5, output: 20, reasoning: 8, totalTokens: 135 } },
+});
+
+it("excludes inherited history and counts repeated cached input without adding reasoning twice", () => {
+	const result = summarize([request("2026-09-09T06:00:00.000Z"), request(start), request(end, "b")], start, end);
+	expect(result).toMatchObject({ calls: 2, input: 20, cacheRead: 200, cacheWrite: 10, output: 40, totalTokens: 270 });
+	expect(result.models.map((m: any) => m.model)).toEqual(["test/a", "test/b"]);
+});
+
+it("uses the latest planning start and the same interval for both sessions", () => {
+	const supervisor = { entries: [
+		{ type: "custom", customType: "pi-goals-main-supervisor-v1", timestamp: start, id: "boundary", data: { mode: "planning", plan: "plan.md" } },
+		request(start),
+	] };
+	const result = report(supervisor, { entries: [request(end)] }, end);
+	expect(result.since).toBe(start);
+	expect(result.elapsedHours).toBe(1);
+	expect(result.sessions.map((s: any) => s.output)).toEqual([20, 20]);
+	expect(() => report({ entries: [] }, { entries: [] }, end)).toThrow("No recorded planning start");
+});
+
+it("reports missing usage and rejects invalid recorded token counts", () => {
+	const missing = { type: "message", timestamp: start, message: { role: "assistant" } };
+	expect(summarize([missing], start, end).missingUsage).toBe(1);
+	const invalid = request(start); invalid.message.usage.input = Number.NaN;
+	expect(() => summarize([invalid], start, end)).toThrow("Invalid usage.input");
+});

test/supervise.test.ts

@@ -1,47 +0,0 @@
-import { EventEmitter } from "node:events";
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { describe, expect, it } from "vitest";
-import { workerPiSupervise } from "../src/supervise.js";
-
-const API_READY = "pi-supervise:api-ready:v1";
-const WORKER_STATE = "pi-supervise:worker-state:v1";
-const WORKER_PAIRED = "pi-supervise:worker-paired:v1";
-
-function pi(events: EventEmitter): ExtensionAPI {
-	return { events } as unknown as ExtensionAPI;
-}
-
-describe("pi-supervise worker API", () => {
-	it("discovers pi-supervise when it loads after pi-goals", async () => {
-		const events = new EventEmitter();
-		const worker = workerPiSupervise(pi(events));
-		events.on(WORKER_STATE, (reply) => reply({ intercomId: "worker-id", paired: false }));
-		events.emit(API_READY);
-		expect((await worker).intercomId).toBe("worker-id");
-	});
-
-	it("discovers an already-loaded pi-supervise and accepts duplicate paired events once", async () => {
-		const events = new EventEmitter();
-		events.on(WORKER_STATE, (reply) => reply({ intercomId: "worker-id", paired: false }));
-		const worker = await workerPiSupervise(pi(events));
-		let acknowledgements = 0;
-		const paired = worker.waitForPair().then(() => { acknowledgements += 1; });
-		events.emit(WORKER_PAIRED, { supervisorIntercomId: "supervisor-id" });
-		events.emit(WORKER_PAIRED, { supervisorIntercomId: "supervisor-id" });
-		await paired;
-		expect(acknowledgements).toBe(1);
-	});
-
-	it("rejects Ready when another supervisor already owns the worker", async () => {
-		const events = new EventEmitter();
-		events.on(WORKER_STATE, (reply) => reply({ intercomId: "worker-id", paired: true }));
-		await expect(workerPiSupervise(pi(events))).rejects.toThrow("already paired");
-	});
-
-	it("times out when the visible supervisor never pairs", async () => {
-		const events = new EventEmitter();
-		events.on(WORKER_STATE, (reply) => reply({ intercomId: "worker-id", paired: false }));
-		const worker = await workerPiSupervise(pi(events), 1);
-		await expect(worker.waitForPair()).rejects.toThrow("did not pair");
-	});
-});

test/supervisor-session.test.ts

@@ -1,172 +0,0 @@
-import { execFileSync } from "node:child_process";
-import { existsSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { afterEach, describe, expect, it, vi } from "vitest";
-import { approvalPath } from "../src/approval.js";
-import { registerVisibleSupervisor } from "../src/supervisor-session.js";
-
-function setup(cwd: string, planPath: string, tokens: number | null = 10, onCompact: (options: any) => void = (options) => options.onComplete()) {
-	vi.stubEnv("PI_GOALS_WORKER_ID", "worker-session");
-	vi.stubEnv("PI_GOALS_WORKER_INTERCOM_ID", "worker-intercom");
-	vi.stubEnv("PI_GOALS_OWNER_SESSION_ID", "worker-session");
-	vi.stubEnv("PI_GOALS_PLAN_PATH", planPath);
-	vi.stubEnv("PI_GOALS_APPROVAL_ID", "approval-1");
-	const hooks = new Map<string, any>();
-	const tools = new Map<string, any>();
-	const entries: any[] = [];
-	const paired: Array<{ workerIntercomId: string; goal: string }> = [];
-	const messages: string[] = [];
-	let branch: any[] = [];
-	const ctx = {
-		cwd,
-		getSystemPrompt: () => "base",
-		getContextUsage: () => tokens === null ? undefined : ({ tokens }),
-		compact: vi.fn(onCompact),
-		sessionManager: {
-			getEntries: () => entries,
-			getBranch: () => branch,
-			getSessionId: () => "supervisor-session",
-		},
-		ui: { notify: vi.fn() },
-	};
-	const pi = {
-		events: {
-			on() {},
-			emit(name: string, request: any) {
-				if (name !== "pi-supervise:pair:v1") return;
-				paired.push({ workerIntercomId: request.workerIntercomId, goal: request.goal });
-				request.resolve();
-			},
-		},
-		on: (name: string, handler: any) => hooks.set(name, handler),
-		registerTool: (tool: any) => tools.set(tool.name, tool),
-		appendEntry: (customType: string, data: unknown) => entries.push({ type: "custom", customType, data }),
-		sendUserMessage: (message: string) => messages.push(message),
-	};
-	registerVisibleSupervisor(pi as unknown as ExtensionAPI);
-	return { branch: (value: any[]) => { branch = value; }, ctx, entries, hooks, messages, paired, tools };
-}
-
-afterEach(() => vi.unstubAllEnvs());
-
-describe("visible supervisor session", () => {
-	it("pairs from session startup before asking the supervisor to work", async () => {
-		const cwd = mkdtempSync(join(tmpdir(), "pi-goals-supervisor-"));
-		try {
-			const runtime = setup(cwd, join(cwd, ".pi/plan/worker-v1.md"));
-			await runtime.hooks.get("session_start")({}, runtime.ctx);
-			await new Promise((resolve) => setImmediate(resolve));
-			expect(runtime.ctx.compact).not.toHaveBeenCalled();
-			expect(runtime.entries.at(-1)).toMatchObject({ customType: "pi-goals-visible-supervisor-v1" });
-			expect(runtime.paired).toEqual([{ workerIntercomId: "worker-intercom", goal: join(cwd, ".pi/plan/worker-v1.md") }]);
-			expect(runtime.messages).toEqual(["Supervision is paired. Inspect the worker and give its next concrete instruction."]);
-		} finally {
-			rmSync(cwd, { recursive: true, force: true });
-		}
-	});
-
-	it("compacts a large planning fork before pairing", async () => {
-		const cwd = mkdtempSync(join(tmpdir(), "pi-goals-supervisor-"));
-		try {
-			let complete: (() => void) | undefined;
-			const runtime = setup(cwd, join(cwd, ".pi/plan/worker-v1.md"), 20_001, (options) => { complete = options.onComplete; });
-			await runtime.hooks.get("session_start")({}, runtime.ctx);
-			await new Promise((resolve) => setImmediate(resolve));
-			expect(runtime.ctx.compact).toHaveBeenCalledOnce();
-			expect(runtime.paired).toHaveLength(0);
-			complete!();
-			await new Promise((resolve) => setImmediate(resolve));
-			expect(runtime.paired).toHaveLength(1);
-			expect(runtime.messages).toEqual(["Supervision is paired. Inspect the worker and give its next concrete instruction."]);
-		} finally {
-			rmSync(cwd, { recursive: true, force: true });
-		}
-	});
-
-	it("does not start work when initial compaction fails", async () => {
-		const cwd = mkdtempSync(join(tmpdir(), "pi-goals-supervisor-"));
-		try {
-			const runtime = setup(cwd, join(cwd, ".pi/plan/worker-v1.md"), null, (options) => options.onError(new Error("offline")));
-			await runtime.hooks.get("session_start")({}, runtime.ctx);
-			await new Promise((resolve) => setImmediate(resolve));
-			expect(runtime.ctx.compact).toHaveBeenCalledOnce();
-			expect(runtime.paired).toHaveLength(0);
-			expect(runtime.ctx.ui.notify).toHaveBeenCalledWith("Supervisor startup compaction failed: offline", "error");
-		} finally {
-			rmSync(cwd, { recursive: true, force: true });
-		}
-	});
-
-	it("does not pair twice across session startup and later turns", async () => {
-		const cwd = mkdtempSync(join(tmpdir(), "pi-goals-supervisor-"));
-		try {
-			const runtime = setup(cwd, join(cwd, ".pi/plan/worker-v1.md"));
-			await runtime.hooks.get("session_start")({}, runtime.ctx);
-			await new Promise((resolve) => setImmediate(resolve));
-			await runtime.hooks.get("before_agent_start")({}, runtime.ctx);
-			expect(runtime.paired).toHaveLength(1);
-		} finally {
-			rmSync(cwd, { recursive: true, force: true });
-		}
-	});
-
-	it("records approval only from a stopped view with evidence and no active work", async () => {
-		const cwd = mkdtempSync(join(tmpdir(), "pi-goals-supervisor-"));
-		try {
-			writeFileSync(join(cwd, ".gitignore"), ".pi/\n");
-			writeFileSync(join(cwd, "verify.txt"), "PASS\n");
-			execFileSync("git", ["init", "-q"], { cwd });
-			execFileSync("git", ["add", ".gitignore", "verify.txt"], { cwd });
-			execFileSync("git", ["-c", "user.name=test", "-c", "user.email=test@example.com", "commit", "-qm", "initial"], { cwd });
-			const planPath = join(cwd, ".pi/plan/worker-v1.md");
-			execFileSync("mkdir", ["-p", join(cwd, ".pi/plan")]);
-			writeFileSync(planPath, "# Plan\n\n## Goals\n\n1. [ ] goal: make the file\n  - discriminator: output exists\n  - evidence:\n    - `result.txt`: contains ok\n\n## Log\n");
-			const runtime = setup(cwd, planPath);
-			runtime.branch([{
-				type: "message",
-				message: { role: "user", content: [{ type: "text", text: "The worker stopped.\n\ntool calls with no result: none\nchild pi processes still running: none" }] },
-			}]);
-			const approved = await runtime.tools.get("ApproveGoal").execute("id", {
-				goal: "make the file",
-				verifyOutputPath: "verify.txt",
-			}, undefined, undefined, runtime.ctx);
-			expect(approved.isError).toBe(false);
-			expect(existsSync(approvalPath(cwd, "worker-session", "make the file"))).toBe(true);
-			const missingOutput = await runtime.tools.get("ApproveGoal").execute("id", {
-				goal: "make the file", verifyOutputPath: "missing.txt",
-			}, undefined, undefined, runtime.ctx);
-			expect(missingOutput.isError).toBe(true);
-			expect(missingOutput.content[0].text).toContain("verification-output");
-			writeFileSync(planPath, "# Plan\n\n## Goals\n\n1. [ ] goal: make the file\n  - evidence:\n    - \n  - tasks:\n    - write result.txt\n");
-			const missingEvidence = await runtime.tools.get("ApproveGoal").execute("id", {
-				goal: "make the file", verifyOutputPath: "verify.txt",
-			}, undefined, undefined, runtime.ctx);
-			expect(missingEvidence.isError).toBe(true);
-			expect(missingEvidence.content[0].text).toContain("nonblank evidence entry");
-		} finally {
-			rmSync(cwd, { recursive: true, force: true });
-		}
-	});
-
-	it("rejects approval while the worker view has an unfinished tool call", async () => {
-		const cwd = mkdtempSync(join(tmpdir(), "pi-goals-supervisor-"));
-		try {
-			const planPath = join(cwd, "plan.md");
-			writeFileSync(planPath, "1. [ ] goal: wait\n  - evidence:\n    - result\n");
-			const runtime = setup(cwd, planPath);
-			runtime.branch([{
-				type: "message",
-				message: { role: "user", content: [{ type: "text", text: "The worker stopped.\n\ntool calls with no result: bash\nchild pi processes still running: none" }] },
-			}]);
-			const rejected = await runtime.tools.get("ApproveGoal").execute("id", {
-				goal: "wait", verifyOutputPath: "verify.txt",
-			}, undefined, undefined, runtime.ctx);
-			expect(rejected.isError).toBe(true);
-			expect(rejected.content[0].text).toContain("bash");
-		} finally {
-			rmSync(cwd, { recursive: true, force: true });
-		}
-	});
-});

test/tick-goal.test.ts

@@ -1,32 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { tickGoal } from "../src/index.js";
-
-const plan = `# Plan
-
-## Goals
-
-1. [/] goal: Implement the cache layer
-  - tasks:
-    1. [x] wire client
-2. [ ] goal: Ship the docs
-
-## Log
-`;
-
-describe("tickGoal (sign-off ticks the goal; agent only ticks on wording drift)", () => {
-	it("ticks the exact-matching goal line, case-insensitive, leaving subtasks alone", () => {
-		const out = tickGoal(plan, "implement the CACHE layer");
-		expect(out).toContain("1. [x] goal: Implement the cache layer");
-		expect(out).toContain("1. [x] wire client"); // subtask untouched (was already x)
-		expect(out).toContain("2. [ ] goal: Ship the docs"); // other goal untouched
-	});
-
-	it("returns null on wording drift (fuzzy matching is the judge's job, not TypeScript's)", () => {
-		expect(tickGoal(plan, "Implement caching")).toBeNull();
-	});
-
-	it("returns null when the subject matches more than one goal line", () => {
-		const dup = `${plan}3. [ ] goal: Ship the docs\n`;
-		expect(tickGoal(dup, "Ship the docs")).toBeNull();
-	});
-});

tsconfig.json

@@ -6,10 +6,12 @@
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
-    "jsx": "react-jsx",
     "outDir": "dist",
     "rootDir": "src",
     "declaration": true
   },
-  "include": ["src/**/*.ts", "src/**/*.tsx"]
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx"
+  ]
 }