ultimate-pi 0.6.1 → 0.8.0

package/.pi/prompts/harness-run.md

@@ -1,60 +1,43 @@
 ---
 description: Execute only against an approved PlanPacket with strict phase gates.
-argument-hint: "--plan <path-to-plan-packet.json> [--budget <amount>]"
+argument-hint: "[--budget <amount>]"
 ---
 
 # harness-run
 
-Execute implementation only after an approved plan exists.
+Orchestrator only — spawn `harness/executor`. Do **not** implement inline.
 
 ## Step 0 — Parse arguments
 
-Read `$ARGUMENTS` and parse:
-
-- required: `--plan <path-to-plan-packet.json>`
 - optional: `--budget <amount>`
+- Do **not** use `--plan` on happy path — load from `[HarnessActivePlan]` / `plan_packet_path`.
 
-If `--plan` is missing, stop and return:
-
-`Usage: /harness-run --plan <path-to-plan-packet.json> [--budget <amount>]`
-
-## Process
-
-1. Validate `--plan` input and confirm it is a valid approved `PlanPacket`.
-2. Execute only within approved scope.
-3. Run focused validations mapped to approved acceptance checks.
-4. Produce rollback artifacts and handoff references for downstream gates.
-
-## Required input
-
-- `--plan` must point to a valid `PlanPacket`.
+If plan not ready:
 
-## Gate behavior
+`Run /harness-plan first — no approved plan in active run context.`
 
-- Refuse execution if no valid plan packet is provided.
-- Keep edits strictly within approved scope.
-- If scope drift appears, stop and return to `harness-plan`.
-- For **implementation forks** inside approved scope, call `ask_user` with 2–4 options. For plan-level ambiguity, stop and return to `harness-plan`.
-- Record evaluator/adversary prerequisites for downstream gates.
-- Always prepare rollback artifacts as part of execution output.
+## Orchestration (required)
 
-## Guardrails
+1. Confirm `[HarnessActivePlan]` / extension reports plan ready.
+2. Build `HarnessSpawnContext` with `mode: execute`, `plan_packet_path`, `run_dir`, `acceptance_checks` from plan file.
+3. Spawn:
 
-- Do not overthink straightforward approved changes; execute the approved scope directly.
-- Only modify files and behaviors covered by the approved `PlanPacket`.
-- Never speculate about successful validation without runnable evidence.
+```
+Agent({ subagent_type: "harness/executor", prompt: "<HarnessSpawnContext + handoff>" })
+```
 
-## Output
+4. `get_subagent_result` — parse executor JSON (`execution_status`, validations, rollback refs).
+5. Parent persists trace/handoff artifacts under run dir if needed; do not self-review.
 
-- Implementation summary scoped to approved plan.
-- Files changed and why.
-- Targeted validations run.
-- Trace pointers and rollback references.
+## Parent rules
 
-## Completion behavior
+- Refuse if plan not approved.
+- On `scope_drift`, stop and recommend `/harness-plan`.
+- Do not call `ask_user` for plan-level ambiguity — return to plan command.
 
-End with:
+## Completion
 
-1. `execution_status` (`completed`, `blocked`, or `scope_drift`).
-2. `validation_summary` (pass/fail with command evidence).
-3. `handoff_ready` booleans for evaluator/adversary prerequisites.
+- `execution_status`: `completed`, `blocked`, or `scope_drift`
+- `validation_summary` with command evidence
+- `handoff_ready` for evaluator/adversary
+- `next_command`: `/harness-eval` (same session — spawn isolated review agents; no new Pi session)

package/.pi/prompts/harness-setup.md

@@ -17,7 +17,7 @@ Bootstraps the complete ultimate-pi agentic harness: Graphify knowledge graph, C
 | Provider detection from `OPENAI_*` / `ANTHROPIC_*` env only | Wrong for pi users — keys live in `~/.pi/agent/auth.json`. Use `harness-generate-model-router.mjs` (Pi `ModelRegistry.getAvailable()`). |
 | Re-running 2.1–2.8 manually after CLI verify | Wasteful — trust `harness-cli-verify.sh` output; only fix reported ✗ lines. |
 | Overwriting `AGENTS.md` after graphify | Graphify appends a section — **merge**, do not replace (Step 4.3). |
-| `sentrux-rules-sync` without project manifest | Use **`harness-sentrux-bootstrap.mjs`** (Step 4.4) — seeds manifest + idempotent rules sync. |
+| `sentrux-rules-sync` without project manifest | Use **`harness-sentrux-bootstrap.mjs`** (Step 4.2) — seeds manifest + idempotent rules sync. |
 | Re-running bootstrap with `--force` on unchanged manifest | Wasteful but safe — default bootstrap skips when hash unchanged; `--force` only after manifest edits. |
 | `graph.json` uses `links`, not `edges` | Step 6 stats: `g.get('edges', g.get('links', []))`. |
 | Guessing harness-web / `.env` defaults when `ask_user` is available | **Mandatory `ask_user`** at Step 4.0 unless `--non-interactive`. |
@@ -319,7 +319,7 @@ Install all 52 language plugins:
 sentrux plugin add-standard 2>/dev/null || echo "Plugins already installed or failed"
 ```
 
-Ensure the **sentrux** Pi skill is linked (see Step 4.2). **Rules.toml bootstrap runs in Step 4.3** (idempotent, merge-safe).
+**Rules.toml bootstrap runs in Step 4.2** (idempotent, merge-safe). Sentrux CLI workflows use the package **`sentrux`** skill (`.agents/skills/sentrux`); no symlink into `.pi/skills/` required.
 
 ## Step 3 — Pi Extension Packages
 
@@ -385,6 +385,8 @@ Manual override: **`/router profile auto`** anytime after reload if they changed
 
 `harness-subagents` loads agents from the installed **`ultimate-pi`** package (`$UP_PKG/.pi/agents/**`) with namespaced ids (`harness/planner`, `pi-pi/agent-expert`). **Do not copy** agents into the project unless you want a deliberate override.
 
+**Slash commands are orchestrators:** `/harness-plan`, `/harness-run`, etc. spawn `harness/*` agents via the `Agent` tool — bootstrap stays **script-first**; only optionally spawn `harness/sentrux-bootstrap` for Sentrux (see Step 4.2).
+
 Optional per-repo overrides: place `.md` files at the **same relative path** (e.g. `.pi/agents/harness/planner.md` overrides the package planner).
 
 Verify manifest drift after `pi update ultimate-pi`:
@@ -496,29 +498,7 @@ Ensure `.gitignore` contains:
 !.sentrux/rules.toml
 ```
 
-### 4.2 — Sentrux Pi skill
-
-Pi does **not** load `.pi/mcp.json`. Agents use Sentrux via the **CLI** and the **`sentrux`** skill.
-
-From **project root**, ensure the skill is discoverable (idempotent):
-
-```bash
-UP_PKG="$(node -p "require('path').dirname(require.resolve('ultimate-pi/package.json'))")"
-SKILL_SRC="$UP_PKG/.agents/skills/sentrux"
-SKILL_DST=".pi/skills/sentrux"
-if [ -d "$SKILL_SRC" ] && [ ! -e "$SKILL_DST" ]; then
-  ln -s "../../.agents/skills/sentrux" "$SKILL_DST"
-  echo "✓ linked $SKILL_DST → sentrux skill"
-elif [ -e "$SKILL_DST" ]; then
-  echo "✓ sentrux skill already present at $SKILL_DST"
-else
-  echo "✗ missing $SKILL_SRC — reinstall ultimate-pi"
-fi
-```
-
-After `/reload`, agents can invoke **`/skill:sentrux`** for install paths, `sentrux check`, `sentrux gate --save` / `sentrux gate`, and harness integration. **context-mode** remains a separate `npm:context-mode` package in `.pi/settings.json` (its own MCP bridge inside that extension).
-
-### 4.3 — Sentrux rules bootstrap (required)
+### 4.2 — Sentrux rules bootstrap (required)
 
 **Skill:** invoke **harness-sentrux-setup** before hand-editing rules or manifest.
 
@@ -552,7 +532,7 @@ Set up structural regression baseline (optional):
 sentrux gate --save . 2>/dev/null || echo "Baseline will be saved on first gate run"
 ```
 
-### 4.4 — Project AGENTS.md
+### 4.3 — Project AGENTS.md
 
 **Do not overwrite** an existing `AGENTS.md` — graphify bootstrap may have appended a `## Graphify` section. If missing, create minimal onboarding content; if present, only add harness subsections that are absent.
 
@@ -681,7 +661,7 @@ Output summary table:
 | biome | ✓/✗ | Project config: found/default |
 | ast-grep | ✓/✗ | AST-aware code search (`sg`)
 | gh CLI | ✓/✗ | Auth: yes/no |
-| sentrux | ✓/✗ | CLI + plugins; rules via Step 4.3 bootstrap |
+| sentrux | ✓/✗ | CLI + plugins; rules via Step 4.2 bootstrap |
 | Sentrux rules.toml | ✓/✗ | `.sentrux/rules.toml` synced from manifest |
 | pi extensions | ✓/✗ | 4 packages |
 | model router | ✓/✗ | Package + config verified, activation via `/router profile auto` |

package/.pi/prompts/harness-trace.md

@@ -1,51 +1,32 @@
 ---
 description: Query and summarize harness run traces for replay and forensics.
-argument-hint: "--run <run-id> [--phase plan|execute|evaluate|adversary|merge]"
+argument-hint: "[--run <run-id>] [--phase plan|execute|evaluate|adversary|merge]"
 ---
 
 # harness-trace
 
-Retrieve and summarize trace artifacts for a run.
+Orchestrator — spawn `harness/trace-librarian`.
 
 ## Step 0 — Parse arguments
 
-Read `$ARGUMENTS` and parse:
-
-- required: `--run <run-id>`
+- optional: `--run <run-id>` (recovery only)
 - optional: `--phase plan|execute|evaluate|adversary|merge`
 
-If `--run` is missing, stop and return:
-
-`Usage: /harness-trace --run <run-id> [--phase plan|execute|evaluate|adversary|merge]`
-
-## Process
-
-1. Collect run artifacts from canonical harness locations and provided trace refs.
-2. Build phase timeline with policy and gate decision points.
-3. Report completeness gaps against strict gate artifact requirements.
-
-## Requirements
-
-- Use `.pi/harness/runs/` and external trace references as source of truth pointers.
-- Include phase timeline, artifact refs, and policy decisions.
-- Highlight missing artifacts that violate strict gate requirements.
-
-## Guardrails
+Happy path: omit `--run`.
 
-- Do not overthink simple trace lookups; prioritize completeness and stable references.
-- Only report artifacts for the requested run and optional phase filter.
-- Never infer artifact existence without verifying source pointers.
+## Orchestration (required)
 
-## Output
+1. Build `HarnessSpawnContext` with `mode: trace`, `run_dir`, optional phase filter.
+2. Spawn:
 
-- Replay-ready timeline summary.
-- Artifact index (`plan`, `run`, `eval`, `adversary`, `consensus`, `incident`, `rollback`).
-- Any integrity or completeness gaps.
+```
+Agent({ subagent_type: "harness/trace-librarian", prompt: "…" })
+```
 
-## Completion behavior
+3. `get_subagent_result` — present timeline and artifact index to user.
 
-Always end with:
+## Completion
 
-- `trace_completeness` (`complete` or `incomplete`)
-- missing artifact checklist (if any)
-- most likely next command (`/harness-incident`, `/harness-review`, or `/harness-critic`)
+- `trace_completeness`: `complete` or `incomplete`
+- Missing artifact checklist
+- `next_command` hint (`/harness-incident`, `/harness-review`, or `/harness-critic`)

package/.pi/scripts/harness-generate-model-router.mjs

@@ -3,13 +3,13 @@
  * Generate `.pi/model-router.json` from Pi's authenticated providers (auth.json + env),
  * not from raw env-var heuristics alone.
  *
- * Uses @mariozechner/pi-coding-agent ModelRegistry.getAvailable() — same source as /login.
+ * Uses @earendil-works/pi-coding-agent ModelRegistry.getAvailable() — same source as /login.
  *
  * Usage: node harness-generate-model-router.mjs [--force] [--dry-run]
  *   --force    overwrite existing .pi/model-router.json
  *   --dry-run  print JSON to stdout, do not write
  *
- * Requires @mariozechner/pi-coding-agent (peer of ultimate-pi; bundled with pi).
+ * Requires @earendil-works/pi-coding-agent (peer of ultimate-pi; bundled with pi).
  */
 
 import { existsSync, mkdirSync, writeFileSync } from "node:fs";
@@ -66,26 +66,29 @@ function fail(msg) {
 }
 
 async function loadPiCodingAgent() {
-	const agentRoots = [
-		join(UP_PKG, "node_modules", "@mariozechner", "pi-coding-agent"),
-		join(UP_PKG, ".pi", "npm", "node_modules", "@mariozechner", "pi-coding-agent"),
-	];
+	const scopes = ["@earendil-works", "@mariozechner"];
+	const agentRoots = scopes.flatMap((scope) => [
+		join(UP_PKG, "node_modules", scope, "pi-coding-agent"),
+		join(UP_PKG, ".pi", "npm", "node_modules", scope, "pi-coding-agent"),
+	]);
 	for (const root of agentRoots) {
 		const entry = join(root, "dist", "index.js");
 		if (existsSync(entry)) {
 			return import(pathToFileURL(entry).href);
 		}
 	}
-	for (const base of [UP_PKG, process.cwd()]) {
-		try {
-			const req = createRequire(join(base, "package.json"));
-			return req("@mariozechner/pi-coding-agent");
-		} catch {
-			/* try next */
+	for (const spec of ["@earendil-works/pi-coding-agent", "@mariozechner/pi-coding-agent"]) {
+		for (const base of [UP_PKG, process.cwd()]) {
+			try {
+				const req = createRequire(join(base, "package.json"));
+				return req(spec);
+			} catch {
+				/* try next */
+			}
 		}
 	}
 	fail(
-		"@mariozechner/pi-coding-agent not found (install pi or npm i in ultimate-pi). Peer: @mariozechner/pi-coding-agent",
+		"@earendil-works/pi-coding-agent not found (install pi or npm i in ultimate-pi). Peer: @earendil-works/pi-coding-agent",
 	);
 }
 

package/.pi/scripts/harness-verify.mjs

@@ -16,10 +16,12 @@ const ADRS = join(ROOT, ".pi", "harness", "docs", "adrs");
 
 const REQUIRED_SCHEMAS = [
 	"harness-run-record.schema.json",
+	"harness-run-context.schema.json",
 	"harness-posthog-event.schema.json",
 	"observation.schema.json",
 	"run-trace.schema.json",
 	"eval-verdict.schema.json",
+	"harness-spawn-context.schema.json",
 ];
 
 const REQUIRED_ADRS = [
@@ -32,10 +34,13 @@ const REQUIRED_ADRS = [
 	"0007-interactive-drift-monitor.md",
 	"0008-harness-posthog-telemetry.md",
 	"0009-sentrux-rules-lifecycle.md",
+	"0031-harness-run-context.md",
+	"0032-harness-command-orchestration.md",
 ];
 
 const REQUIRED_EXTENSIONS = [
 	"harness-telemetry.ts",
+	"harness-run-context.ts",
 	"trace-recorder.ts",
 	"observation-bus.ts",
 	"drift-monitor.ts",
@@ -192,6 +197,35 @@ async function main() {
 	if (!(await fileExists(libPath))) fail("missing lib/harness-posthog.ts");
 	ok("lib/harness-posthog.ts");
 
+	const runCtxLib = join(ROOT, ".pi", "lib", "harness-run-context.ts");
+	if (!(await fileExists(runCtxLib))) fail("missing lib/harness-run-context.ts");
+	ok("lib/harness-run-context.ts");
+
+	const policyGateSrc = await readFile(
+		join(ROOT, ".pi", "extensions", "policy-gate.ts"),
+		"utf-8",
+	);
+	if (!policyGateSrc.includes("isPlanPhaseAllowedMutation")) {
+		fail(
+			"policy-gate.ts must use isPlanPhaseAllowedMutation (plan-phase scoped writes)",
+		);
+	}
+	if (!policyGateSrc.includes('pi.on("tool_call", async (event, ctx)')) {
+		fail("policy-gate tool_call must receive ctx for run context");
+	}
+	ok("policy-gate plan-phase writes");
+
+	const runCtxFixture = join(SMOKE, "run-context.fixture.json");
+	if (!(await fileExists(runCtxFixture))) {
+		fail("missing run-context.fixture.json");
+	}
+	const runCtxData = JSON.parse(await readFile(runCtxFixture, "utf-8"));
+	if (runCtxData.schema_version !== "1.0.0") {
+		fail("run-context fixture schema_version must be 1.0.0");
+	}
+	if (!runCtxData.run_id) fail("run-context fixture missing run_id");
+	ok("run-context.fixture.json");
+
 	const fixture = JSON.parse(
 		await readFile(join(SMOKE, "run-record.fixture.json"), "utf-8"),
 	);

package/.pi/scripts/vendor-sync-pi-model-router.sh

@@ -11,19 +11,19 @@ rm -rf "$VEND/.git"
 
 for f in "$VEND"/extensions/*.ts; do
 	sed -i \
-		-e "s|'@earendil-works/pi-agent-core'|'@mariozechner/pi-agent-core'|g" \
-		-e "s|'@earendil-works/pi-ai'|'@mariozechner/pi-ai'|g" \
-		-e "s|'@earendil-works/pi-coding-agent'|'@mariozechner/pi-coding-agent'|g" \
-		-e "s|'@earendil-works/pi-tui'|'@mariozechner/pi-tui'|g" \
+		-e "s|'@earendil-works/pi-agent-core'|'@earendil-works/pi-agent-core'|g" \
+		-e "s|'@earendil-works/pi-ai'|'@earendil-works/pi-ai'|g" \
+		-e "s|'@earendil-works/pi-coding-agent'|'@earendil-works/pi-coding-agent'|g" \
+		-e "s|'@earendil-works/pi-tui'|'@earendil-works/pi-tui'|g" \
 		"$f"
 done
 
-# Align package.json peers with @mariozechner (upstream lists @earendil-works)
+# Align package.json peers with @earendil-works (upstream lists @earendil-works)
 sed -i \
-	-e 's|"@earendil-works/pi-agent-core"|"@mariozechner/pi-agent-core"|g' \
-	-e 's|"@earendil-works/pi-ai"|"@mariozechner/pi-ai"|g' \
-	-e 's|"@earendil-works/pi-coding-agent"|"@mariozechner/pi-coding-agent"|g' \
-	-e 's|"@earendil-works/pi-tui"|"@mariozechner/pi-tui"|g' \
+	-e 's|"@earendil-works/pi-agent-core"|"@earendil-works/pi-agent-core"|g' \
+	-e 's|"@earendil-works/pi-ai"|"@earendil-works/pi-ai"|g' \
+	-e 's|"@earendil-works/pi-coding-agent"|"@earendil-works/pi-coding-agent"|g' \
+	-e 's|"@earendil-works/pi-tui"|"@earendil-works/pi-tui"|g' \
 	"$VEND/package.json"
 
 python3 -c "
@@ -40,7 +40,7 @@ cat >"$VEND/UPSTREAM_PIN.md" <<EOF
 - **Repository:** https://github.com/yeliu84/pi-model-router
 - **License:** MIT (\`LICENSE\` in this tree)
 - **Pinned upstream commit:** \`$COMMIT\`
-- **Local changes:** \`extensions/*.ts\` imports use \`@mariozechner/*\` and relative paths end in \`.js\` for TypeScript nodenext.
+- **Local changes:** \`extensions/*.ts\` imports use \`@earendil-works/*\` and relative paths end in \`.js\` for TypeScript nodenext.
 EOF
 
 rm -f "$VEND/package-lock.json"

package/CHANGELOG.md

@@ -4,6 +4,39 @@ All notable changes to this project are documented in this file.
 
 ## [Unreleased]
 
+## [v0.8.0] — 2026-05-17
+
+### ✨ Features
+
+- **Harness command orchestration:** slash prompts spawn `harness/*` agents with required `HarnessSpawnContext`; subagent tool policy; L4 review via isolated subagents (not session fork); ADR 0032.
+
+### 🐛 Fixes
+
+- **Policy gate / harness-plan:** allow scoped writes to `plan-packet.json` in plan phase after `ask_user` approval; block project source edits until execute; promote `/harness-auto` to execute phase mid-turn after approved plan write.
+
+### 📖 Documentation
+
+- **Harness plan workflow:** present full plan → Approve via `ask_user` → persist packet; `--quick` does not skip approval (ADR 0031).
+
+### 🔧 Chores
+
+- **pi-coding-agent:** migrate peer/dev deps to `@earendil-works/pi-coding-agent` 0.74.1.
+
+## [v0.7.0] — 2026-05-17
+
+### ✨ Features
+
+- **Harness run context:** track active run and canonical plan path in session; short slash commands without `--run` or `--plan`; project `active-run.json` for forked eval sessions; ADR 0031.
+- **System prompt extension:** load packaged `.pi/SYSTEM.md` by default with optional workspace `.pi/system.md` override.
+
+### 📖 Documentation
+
+- **README and harness prompts:** manual workflow without run IDs; `harness-run-status`, `harness-new-run`, `harness-use-run` helpers.
+
+### 🔧 Chores
+
+- **harness-setup:** remove Sentrux skill symlink step; rules bootstrap only.
+
 ## [v0.6.1] — 2026-05-17
 
 ### 🐛 Fixes
@@ -95,7 +128,7 @@ All notable changes to this project are documented in this file.
 
 - Remove `npm:@yeliu84/pi-model-router` from package dependencies; add `THIRD_PARTY_NOTICES.md`
 - `harness-sync-model-router.mjs` adjusts Pi defaults only (no package toggling)
-- `check:ts` uses ES2023; devDependency on `@mariozechner/pi-ai`, `pi-tui`, `pi-agent-core` for vendored typecheck
+- `check:ts` uses ES2023; devDependency on `@earendil-works/pi-ai`, `pi-tui`, `pi-agent-core` for vendored typecheck
 
 ### 🐛 Fixes
 

package/README.md

@@ -29,11 +29,12 @@ pi install npm:ultimate-pi
 
 That runs: plan → execute → evaluate → adversary → policy decision. It does **not** auto-merge.
 
-If something blocks, inspect the last run:
+If something blocks, inspect status (no run id needed):
 
 ```text
-/harness-trace-last
+/harness-run-status
 /harness-policy-status
+/harness-trace-last
 ```
 
 ## Commands
@@ -42,15 +43,18 @@ If something blocks, inspect the last run:
 |---------|----------------|
 | `/harness-setup` | One-time project bootstrap (tools, harness dirs, extensions) |
 | `/harness-auto "<task>"` | End-to-end pipeline (recommended) |
-| `/harness-plan "<task>"` | Plan only (no code changes) |
-| `/harness-run --plan <file>` | Execute an approved plan |
-| `/harness-eval --run <run-id>` | Evaluation summary |
-| `/harness-review --run <run-id>` | Independent review verdict |
-| `/harness-critic --run <run-id>` | Adversarial review |
-| `/harness-trace --run <run-id>` | Full trace for a run |
-| `/harness-trace-last` | Summary of the most recent run |
+| `/harness-plan "<task>"` | Create or **revise** the active plan in context (no plan path to copy) |
+| `/harness-run` | Execute the active plan from context (**no `--plan`** on happy path) |
+| `/harness-eval` | Eval for active run (optional `--run`; spawns isolated `harness/evaluator`) |
+| `/harness-review` | Independent review (optional `--run`) |
+| `/harness-critic` | Adversarial review (optional `--run`) |
+| `/harness-trace` | Trace summary (optional `--run`) |
+| `/harness-run-status` | Where you are + what to run next (no run id shown) |
+| `/harness-new-run` | Abandon current run and start fresh |
+| `/harness-use-run <id>` | Advanced recovery only |
+| `/harness-trace-last` | Last phase / handoff (no run id) |
 | `/harness-policy-status` | Current policy / block reasons |
-| `/harness-abort [reason]` | Stop and return to plan-only mode |
+| `/harness-abort [reason]` | Stop and replan path |
 
 ## Manual workflow
 
@@ -58,15 +62,23 @@ Use this when you want each step separate:
 
 ```text
 /harness-plan "your task"
-/harness-run --plan .pi/harness/runs/<run-id>/plan-packet.json
-/harness-eval --run <run-id>
-/harness-review --run <run-id>
-/harness-critic --run <run-id>
+/harness-run
+/harness-eval
+/harness-review
+/harness-critic
 ```
 
+The harness **remembers the active run and plan** per project — you do not pass `plan-packet.json` paths or run ids between steps. The live widget shows phase/policy; after each step the agent (and UI notify) suggests the next command.
+
+Recovery: `--run` and `--plan` remain for scripts; `/harness-use-run` and `/harness-run-status` for operators.
+
 ## Defaults you should know
 
+- **System prompt** — [`.pi/extensions/00-ultimate-pi-system-prompt.ts`](.pi/extensions/00-ultimate-pi-system-prompt.ts) sets the base prompt from packaged [`.pi/SYSTEM.md`](.pi/SYSTEM.md), or from your workspace override **`.pi/system.md`** (lowercase) if you create one. Nothing is copied into your project by default. After upgrading the package or editing either file, run **`/reload`**.
 - **Model routing (vendored + gated)** — [`pi-model-router`](https://github.com/yeliu84/pi-model-router) ships inside this package (`vendor/pi-model-router/`). [`.pi/extensions/pi-model-router-harness.ts`](.pi/extensions/pi-model-router-harness.ts) activates it **only after** `.pi/model-router.json` exists (generation: `/harness-setup` Step 3.5), so **`router/auto` does not appear** beforehand. See [THIRD_PARTY_NOTICES.md](THIRD_PARTY_NOTICES.md). [`.pi/scripts/harness-sync-model-router.mjs`](.pi/scripts/harness-sync-model-router.mjs) may set **`defaultProvider`/`defaultModel`** to **`router`/`auto`** when the project sets no default — run **`/reload`** afterward. Do **not** add `npm:@yeliu84/pi-model-router` to `.pi/settings.json`; it duplicates the fork. Maintainer refresh: **`npm run vendor:sync-router`**.
+- **Active run + plan context** — PlanPacket lives at a fixed path per run; the extension injects it for `/harness-plan` (revise) and `/harness-run` (execute). Session state plus `.pi/harness/active-run.json`; no run ids or plan paths to copy.
+- **Review isolation** — `/harness-eval`, `/harness-review`, and `/harness-critic` spawn isolated subagents (`inherit_context: false`); stay in the same session (see ADR 0032).
+- **Concurrent plans** — a second `/harness-plan` while a run is active is blocked until `/harness-abort` or `/harness-new-run` (except drift replan / amend after `needs_clarification`).
 - **Plan before mutate** — write/edit/shell that changes the repo is blocked until execute phase.
 - **No auto-merge** — you decide when to open or merge a PR.
 - **Structured runs** — each run writes artifacts under `.pi/harness/runs/` for replay and audit.
@@ -78,7 +90,11 @@ Optional: copy [`.env.example`](.env.example) to `.env` if you use PostHog or ot
 | Problem | Try |
 |---------|-----|
 | Setup fails | `node --version` (need 18+), rerun `/harness-setup` |
-| Blocked in evaluate/review | Run review in a fresh session (isolation from execute) |
+| "No active run" on eval | Finish plan+run first, or `/harness-run-status` |
+| Forgot where you left off | `/harness-run-status` |
+| Second plan rejected | `/harness-abort` or `/harness-new-run` |
+| Blocked in evaluate/review | Spawn review via Agent (`harness/evaluator` / `harness/adversary`); do not run review tools inline in execute phase |
+| High plan drift | `harness-drift-replan` or abort then replan (ADR 0007) |
 | Budget / scope stop | `/harness-budget-status`, narrow the task or split the plan |
 | Test integrity warning | `/harness-test-integrity-last`, fix or justify test changes |
 

package/THIRD_PARTY_NOTICES.md

@@ -5,7 +5,7 @@
 - **Project:** https://github.com/yeliu84/pi-model-router  
 - **License:** MIT ([vendor/pi-model-router/LICENSE](vendor/pi-model-router/LICENSE))  
 - **Pinned revision:** See [vendor/pi-model-router/UPSTREAM_PIN.md](vendor/pi-model-router/UPSTREAM_PIN.md)  
-- ultimate-pi loads it from [`vendor/pi-model-router`](vendor/pi-model-router); import specifiers were adapted for `@mariozechner/pi-coding-agent` and related Pi packages.
+- ultimate-pi loads it from [`vendor/pi-model-router`](vendor/pi-model-router); import specifiers were adapted for `@earendil-works/pi-coding-agent` and related Pi packages.
 
 ## pi-vcc (vendored)
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ultimate-pi",
-	"version": "0.6.1",
+	"version": "0.8.0",
 	"description": "Ultimate AI coding harness for pi.dev — extensible skills, Obsidian wiki knowledge layer, compressed context, deterministic output",
 	"keywords": [
 		"pi-package",
@@ -70,10 +70,10 @@
 		"vendor/pi-vcc"
 	],
 	"peerDependencies": {
-		"@mariozechner/pi-coding-agent": "*"
+		"@earendil-works/pi-coding-agent": "*"
 	},
 	"scripts": {
-		"check:ts": "tsc --noEmit --target ES2023 --lib ES2023 --moduleResolution nodenext --module nodenext --skipLibCheck .pi/extensions/lib/harness-vcc-settings.ts .pi/extensions/dotenv-loader.ts .pi/extensions/lib/posthog-node.d.ts .pi/extensions/lib/harness-posthog.ts .pi/extensions/lib/harness-paths.ts .pi/extensions/pi-model-router-harness.ts .pi/extensions/provider-payload-sanitize.ts .pi/extensions/harness-telemetry.ts .pi/extensions/harness-ask-user.ts .pi/extensions/lib/ask-user/schema.ts .pi/extensions/lib/ask-user/types.ts .pi/extensions/lib/ask-user/validate.ts .pi/extensions/lib/ask-user/dialog.ts .pi/extensions/lib/ask-user/fallback.ts .pi/extensions/lib/ask-user/render.ts .pi/extensions/trace-recorder.ts .pi/extensions/observation-bus.ts .pi/extensions/drift-monitor.ts .pi/extensions/sentrux-rules-sync.ts .pi/extensions/custom-header.ts .pi/extensions/lib/harness-subagents/agent-loader.ts .pi/extensions/lib/harness-subagents/agent-parser.ts .pi/extensions/lib/harness-subagents/agent-manifest.ts .pi/extensions/lib/harness-subagents/blackboard.ts .pi/extensions/lib/harness-subagents/blackboard-tool.ts .pi/extensions/lib/harness-subagents/spawn-policy.ts .pi/extensions/lib/harness-subagents/types-blackboard.ts .pi/extensions/harness-web-tools.ts .pi/extensions/harness-web-guard.ts .pi/extensions/lib/harness-web/run-cli.ts",
+		"check:ts": "tsc --noEmit --target ES2023 --lib ES2023 --moduleResolution nodenext --module nodenext --skipLibCheck .pi/extensions/00-ultimate-pi-system-prompt.ts .pi/lib/harness-run-context.ts .pi/lib/harness-ui-state.ts .pi/extensions/harness-run-context.ts .pi/extensions/lib/harness-vcc-settings.ts .pi/extensions/dotenv-loader.ts .pi/extensions/lib/posthog-node.d.ts .pi/extensions/lib/harness-posthog.ts .pi/extensions/lib/harness-paths.ts .pi/extensions/pi-model-router-harness.ts .pi/extensions/provider-payload-sanitize.ts .pi/extensions/harness-telemetry.ts .pi/extensions/harness-ask-user.ts .pi/extensions/lib/ask-user/schema.ts .pi/extensions/lib/ask-user/types.ts .pi/extensions/lib/ask-user/validate.ts .pi/extensions/lib/ask-user/dialog.ts .pi/extensions/lib/ask-user/fallback.ts .pi/extensions/lib/ask-user/render.ts .pi/extensions/trace-recorder.ts .pi/extensions/observation-bus.ts .pi/extensions/drift-monitor.ts .pi/extensions/policy-gate.ts .pi/extensions/budget-guard.ts .pi/extensions/debate-orchestrator.ts .pi/extensions/harness-live-widget.ts .pi/extensions/sentrux-rules-sync.ts .pi/extensions/custom-header.ts .pi/extensions/lib/harness-subagents/agent-loader.ts .pi/extensions/lib/harness-subagents/agent-parser.ts .pi/extensions/lib/harness-subagents/agent-manifest.ts .pi/extensions/lib/harness-subagents/blackboard.ts .pi/extensions/lib/harness-subagents/blackboard-tool.ts .pi/extensions/lib/harness-subagents/spawn-policy.ts .pi/extensions/lib/harness-subagents/types-blackboard.ts .pi/extensions/harness-web-tools.ts .pi/extensions/harness-web-guard.ts .pi/extensions/lib/harness-web/run-cli.ts",
 		"vendor:sync-router": "bash .pi/scripts/vendor-sync-pi-model-router.sh",
 		"vendor:sync-vcc": "bash .pi/scripts/vendor-sync-pi-vcc.sh",
 		"release": "bash .pi/scripts/release.sh",
@@ -82,7 +82,7 @@
 		"format": "biome format --write",
 		"format:check": "biome format",
 		"prepare": "lefthook install",
-		"test": "node --test test/harness-verify.test.mjs test/harness-ask-user.test.mjs test/harness-subagents-loader.test.mjs test/sentrux-rules-sync.test.mjs && npx -y tsx --test test/harness-vcc-settings.test.ts",
+		"test": "node --test test/harness-verify.test.mjs test/harness-ask-user.test.mjs test/harness-subagents-loader.test.mjs test/sentrux-rules-sync.test.mjs && npx -y tsx --test test/harness-vcc-settings.test.ts test/harness-plan-phase-policy.test.mjs test/harness-subagent-policy.test.mjs",
 		"test:vcc": "npx -y tsx --test vendor/pi-vcc/tests/*.test.ts",
 		"harness:sentrux-bootstrap": "node .pi/scripts/harness-sentrux-bootstrap.mjs",
 		"harness:sentrux-sync": "node .pi/scripts/sentrux-rules-sync.mjs --force",
@@ -90,20 +90,25 @@
 	},
 	"devDependencies": {
 		"@biomejs/biome": "2.4.14",
-		"@mariozechner/pi-agent-core": "0.73.0",
-		"@mariozechner/pi-ai": "0.73.0",
-		"@mariozechner/pi-coding-agent": "0.73.0",
-		"@mariozechner/pi-tui": "0.73.0",
+		"@earendil-works/pi-agent-core": "0.74.1",
+		"@earendil-works/pi-ai": "0.74.1",
+		"@earendil-works/pi-coding-agent": "0.74.1",
+		"@earendil-works/pi-tui": "0.74.1",
 		"@sinclair/typebox": "^0.34.49",
 		"lefthook": "2.1.6",
 		"typescript": "^6.0.3"
 	},
 	"dependencies": {
 		"@posthog/pi": "latest",
-		"asciify-image": "^0.1.10",
 		"croner": "^9.0.0",
 		"jimp": "^1.6.1",
 		"nanoid": "^5.1.5",
 		"posthog-node": "^5.30.6"
+	},
+	"overrides": {
+		"@mariozechner/pi-agent-core": "npm:@earendil-works/pi-agent-core@0.74.1",
+		"@mariozechner/pi-ai": "npm:@earendil-works/pi-ai@0.74.1",
+		"@mariozechner/pi-coding-agent": "npm:@earendil-works/pi-coding-agent@0.74.1",
+		"@mariozechner/pi-tui": "npm:@earendil-works/pi-tui@0.74.1"
 	}
 }

package/vendor/pi-model-router/UPSTREAM_PIN.md

@@ -3,6 +3,6 @@
 - **Repository:** https://github.com/yeliu84/pi-model-router
 - **License:** MIT (`LICENSE` in this tree)
 - **Pinned upstream commit:** `8c60095da0e753c242c4be9bb617b85f4dd3255c`
-- **Local changes:** TypeScript imports in `extensions/*.ts` use `@mariozechner/*`; relative imports end in `.js` for NodeNext; `package.json` peerDependencies list `@mariozechner/*`.
+- **Local changes:** TypeScript imports in `extensions/*.ts` use `@earendil-works/*`; relative imports end in `.js` for NodeNext; `package.json` peerDependencies list `@earendil-works/*`.
 
 **Refresh upstream:** run `npm run vendor:sync-router` from ultimate-pi root (updates this file with the latest commit SHA).

package/vendor/pi-model-router/extensions/commands.ts

@@ -1,8 +1,8 @@
 import type {
   ExtensionAPI,
   ExtensionContext,
-} from '@mariozechner/pi-coding-agent';
-import type { AutocompleteItem } from '@mariozechner/pi-tui';
+} from '@earendil-works/pi-coding-agent';
+import type { AutocompleteItem } from '@earendil-works/pi-tui';
 import type {
   RouterConfig,
   RouterPinByProfile,

package/vendor/pi-model-router/extensions/config.ts

@@ -1,7 +1,7 @@
 import { existsSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
-import { getAgentDir } from '@mariozechner/pi-coding-agent';
-import type { ThinkingLevel } from '@mariozechner/pi-agent-core';
+import { getAgentDir } from '@earendil-works/pi-coding-agent';
+import type { ThinkingLevel } from '@earendil-works/pi-agent-core';
 import type {
   RouterConfig,
   RouterProfile,

package/vendor/pi-model-router/extensions/index.ts

@@ -1,7 +1,7 @@
 import type {
   ExtensionAPI,
   ExtensionContext,
-} from '@mariozechner/pi-coding-agent';
+} from '@earendil-works/pi-coding-agent';
 import {
   type RouterConfig,
   type RouterPersistedState,