ultimate-pi 0.18.0 → 0.19.0

package/.pi/{extensions/lib → lib}/plan-approval-readiness.ts

@@ -1,5 +1,5 @@
 /**
- * Pre-approve_plan readiness checks (artifacts, scouts, phase status).
+ * Pre-approve_plan readiness checks (planning context, research, phase status).
  */
 
 import { constants } from "node:fs";
@@ -13,12 +13,6 @@ export interface PlanApprovalReadiness {
 	warnings: string[];
 }
 
-const LEGACY_SCOUT_ARTIFACTS = [
-	"artifacts/scout-graphify.yaml",
-	"artifacts/scout-structure.yaml",
-	"artifacts/scout-semantic.yaml",
-] as const;
-
 const PLANNING_CONTEXT_ARTIFACT = "artifacts/planning-context.yaml";
 
 const PHASE35_ARTIFACTS = [
@@ -86,44 +80,6 @@ function coverageLaneStatus(
 	return String(laneDoc?.status ?? "").toLowerCase();
 }
 
-async function validateLegacyScouts(
-	runDir: string,
-	quick: boolean,
-	errors: string[],
-	warnings: string[],
-): Promise<boolean> {
-	let anyPresent = false;
-	for (const rel of LEGACY_SCOUT_ARTIFACTS) {
-		if (rel === "artifacts/scout-semantic.yaml" && quick) continue;
-		const abs = join(runDir, rel);
-		if (!(await fileExists(abs))) {
-			const waived = await hasPhaseWaiver(runDir, `missing:${rel}`);
-			if (!waived) {
-				errors.push(`missing ${rel}`);
-			}
-			continue;
-		}
-		anyPresent = true;
-		const doc = await readYamlObject(abs);
-		const bad = artifactStatusBad(doc, rel);
-		if (bad) {
-			const waived = await hasPhaseWaiver(
-				runDir,
-				`scout:${rel}:${String(doc?.status ?? "")}`,
-			);
-			if (!waived) {
-				errors.push(bad);
-			}
-		}
-	}
-	if (anyPresent) {
-		warnings.push(
-			"legacy scout YAML artifacts detected — prefer artifacts/planning-context.yaml (see ADR 0041)",
-		);
-	}
-	return anyPresent;
-}
-
 async function validatePlanningContext(
 	runDir: string,
 	quick: boolean,
@@ -203,19 +159,14 @@ export async function validatePlanApprovalReadiness(
 		quick,
 		errors,
 	);
-	const hasLegacyScouts = hasPlanningContext
-		? false
-		: await validateLegacyScouts(runDir, quick, errors, warnings);
 
-	if (!hasPlanningContext && !hasLegacyScouts) {
+	if (!hasPlanningContext) {
 		const waived = await hasPhaseWaiver(
 			runDir,
 			"missing:planning-reconnaissance",
 		);
 		if (!waived) {
-			errors.push(
-				`missing ${PLANNING_CONTEXT_ARTIFACT} (or legacy scout-graphify/structure/semantic trio)`,
-			);
+			errors.push(`missing ${PLANNING_CONTEXT_ARTIFACT}`);
 		}
 	}
 

package/.pi/{extensions/lib → lib}/plan-debate-envelope.ts

@@ -2,7 +2,7 @@
  * Plan Review Gate — convert integrator YAML to debate bus round JSON.
  */
 
-import type { DebateParticipant } from "../../lib/debate-orchestrator-types.js";
+import type { DebateParticipant } from "./debate-orchestrator-types.js";
 
 export interface PlanReviewRoundDraft {
 	schema_version: string;

package/.pi/{extensions/lib → lib}/plan-debate-gate.ts

@@ -5,8 +5,8 @@
 import { constants } from "node:fs";
 import { access, readFile } from "node:fs/promises";
 import { join } from "node:path";
-import { isHarnessBudgetEnforceOn } from "../../lib/harness-budget-enforce.js";
 import { capsForDebate } from "./debate-bus-core.js";
+import { isHarnessBudgetEnforceOn } from "./harness-budget-enforce.js";
 import type { DebateEligibilityResult } from "./plan-debate-eligibility.js";
 import {
 	getPlanFocusCoverage,

package/.pi/{extensions/lib → lib}/plan-debate-lane.ts

@@ -5,10 +5,7 @@
 import { constants } from "node:fs";
 import { access, mkdir } from "node:fs/promises";
 import { dirname, join } from "node:path";
-import {
-	parseStructuredDocument,
-	writeYamlFile,
-} from "../../lib/harness-yaml.js";
+import { parseStructuredDocument, writeYamlFile } from "./harness-yaml.js";
 import { postMessengerMessage } from "./plan-messenger.js";
 
 export type DebateLaneKind =

package/.pi/{extensions/lib → lib}/plan-messenger.ts

@@ -16,7 +16,7 @@ import {
 	writeFile,
 } from "node:fs/promises";
 import { join } from "node:path";
-import type { DebateParticipant } from "../../lib/debate-orchestrator-types.js";
+import type { DebateParticipant } from "./debate-orchestrator-types.js";
 import type { DebateProfile } from "./plan-debate-eligibility.js";
 import type { PlanDebateFocus } from "./plan-debate-focus.js";
 

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

@@ -21,7 +21,7 @@ If task missing:
 Follow **harness-plan** performance rules (`subagent` with `agentScope: "both"`). Use parallel `tasks` only for Phase 3.5 research (≤2 lanes) when subprocesses are needed. Never parallelize decompose∥hypothesis or debate lanes — precheck enforces this.
 
 1. **Plan** — follow `/harness-plan` (context → lakes/synthesis or sequential framing → research → plan-verify → `approve_plan()` + `create_plan()`). One approval.
-2. **Execute** — `harness/executor` with `executor_strategy` from packet (default `single_pass` for low/med).
+2. **Execute** — `harness/running/executor` with `executor_strategy` from packet (default `single_pass` for low/med).
 3. **Review** — always **`/harness-review`** after execute (no benchmark fail-fast).
 4. **Steer loop** — while `review-outcome.remediation_class === implementation_gap` and `steer_attempt < HARNESS_STEER_MAX_ATTEMPTS`: `/harness-steer` → `/harness-review` (tiered adversary on attempts 2+).
 5. **Parent** — apply locked strict gates; commit/PR only when `remediation_class: pass`.
@@ -50,7 +50,7 @@ Block commit/PR if any fails: plan gate, execution in scope, evaluator pass, adv
 - `--quick` reduces breadth (skips semantic coverage in planning context, post-run adversary, tie-breaker), never core safety gates on plan approval or evaluator.
 - High risk/ambiguity → stop and recommend manual `/harness-plan` with `ask_user`.
 - Interrupt: `/harness-abort [reason]` then `/harness-plan`.
-- Artifact refs under active run dir; `/harness-run-status` or `/harness-trace-last` for handoff.
+- Artifact refs under active run dir; use `/harness-trace` for handoff and forensics.
 
 ## Completion
 

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

@@ -26,8 +26,6 @@ Subagents persist artifacts via scoped **`submit_*`** tools (deterministic YAML
 - `harness/planning/sprint-contract-auditor` (DoD auditor)
 - `harness/planning/review-integrator` (recorder / integration PM)
 
-Legacy (deprecated, ADR 0041): `scout-graphify`, `scout-structure`, `scout-semantic` — do not spawn by default.
-
 Read **harness-debate-plan** skill before Review Gate rounds.
 
 ## Team topology (spawn laws)
@@ -72,16 +70,16 @@ Do **not** run `ccc index` or `ccc search --refresh`. The harness runs increment
 3. Use `ccc search` for semantic implementation matches (unless `--quick` — set `coverage.semantic.status: skipped`).
 4. Write `artifacts/planning-context.yaml` via `write_harness_yaml` with `schema_version: "1.0.0"`, `status`, `summary`, `coverage` (architecture + structure required; semantic per risk/quick), `findings`, `evidence_refs`, `open_questions`.
 
-**Optional subprocess:** Spawn **at most one** `harness/planning/planning-context` when the brief is large or you need context isolation. Do **not** spawn legacy `scout-*` agents in parallel by default.
+**Optional subprocess:** Spawn **at most one** `harness/planning/planning-context` when the brief is large or you need context isolation.
 
-Gate: `harness_artifact_ready({ paths: ["artifacts/planning-context.yaml"] })` (legacy trio of `scout-*.yaml` still accepted for one release — see ADR 0041).
+Gate: `harness_artifact_ready({ paths: ["artifacts/planning-context.yaml"] })`.
 
 ## Phase 2a — WBS / scope decomposition (sequential)
 
 **Practice:** PMBOK scope / WBS; Berkun — how the team divides work.
 
 ```
-subagent({ agentScope: "both", agent: "harness/planning/decompose", task: "<HarnessSpawnContext + path to planning-context.yaml or legacy scout artifacts>" })
+subagent({ agentScope: "both", agent: "harness/planning/decompose", task: "<HarnessSpawnContext + path to planning-context.yaml>" })
 ```
 
 Gate: `harness_artifact_ready({ paths: ["artifacts/decomposition.yaml"] })`.
@@ -213,7 +211,7 @@ Med/low non-fork plans with clear stack and no implementation `open_questions` d
 
 ## Phase 5 — Structured inspection / Review Gate (Fagan-style)
 
-**Practice:** Code Complete collaborative construction; Fagan inspection with rubrics in `planning-rubrics.md`. Parent is **chair**; one debate agent per `subagent` batch.
+**Practice:** Code Complete collaborative construction; Fagan inspection with rubrics in `.pi/harness/docs/planning-rubrics.md`. Parent is **chair**; one debate agent per `subagent` batch.
 
 **Forbidden:** parallel `subagent` calls for any debate lane agent in one batch.
 

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

@@ -13,9 +13,9 @@ Read **harness-orchestration** and **harness-review** skills before spawning.
 
 ## Allowed subagents
 
-- `harness/evaluator` (`mode: benchmark` then `mode: verdict`)
-- `harness/adversary` (independent red team)
-- `harness/tie-breaker` (escalation only when adversary blocks and eval was `conditional_pass`; skip when `--quick`)
+- `harness/reviewing/evaluator` (`mode: benchmark` then `mode: verdict`)
+- `harness/reviewing/adversary` (independent red team)
+- `harness/reviewing/tie-breaker` (escalation only when adversary blocks and eval was `conditional_pass`; skip when `--quick`)
 
 ## Performance rules
 
@@ -56,10 +56,10 @@ node "$UP_PKG/.pi/scripts/harness-verify.mjs"
 When `HARNESS_SENTRUX_REQUIRED=true`, after verify succeeds:
 
 ```bash
-sentrux gate .
+node "$UP_PKG/.pi/scripts/harness-sentrux-cli.mjs" gate
 ```
 
-Compare to baseline from `/harness-run` (`sentrux gate --save`). If CLI missing, record `gate_status: not_installed`.
+Compare to baseline from `/harness-run` (`harness-sentrux-cli.mjs gate --save`). The wrapper resolves the project root before invoking Sentrux so `.sentrux/rules.toml` is found from run directories. If CLI missing, record `gate_status: not_installed`.
 
 Ensure `artifacts/sentrux-signal.yaml` exists under the run dir (written during `/harness-run`). If missing, write it from the latest `sentrux check` / `gate` output. Append or refresh session entry `harness-sentrux-signal`.
 
@@ -84,7 +84,7 @@ notes: "…"
 ```
 subagent({
   agentScope: "both",
-  agent: "harness/evaluator",
+  agent: "harness/reviewing/evaluator",
   task: "<HarnessSpawnContext mode benchmark + plan_packet_path + run_dir + acceptance_checks + paths: benchmark-log.yaml, sentrux-signal.yaml — treat Sentrux fields as measured structural actuals, not executor goals>"
 })
 ```
@@ -108,7 +108,7 @@ Always run after benchmark (even when benchmark failed).
 ```
 subagent({
   agentScope: "both",
-  agent: "harness/evaluator",
+  agent: "harness/reviewing/evaluator",
   task: "<HarnessSpawnContext mode verdict + treat executor output as untrusted + artifact paths>"
 })
 ```
@@ -126,7 +126,7 @@ Skip when `--quick`. **Tiered steer:** full adversary on initial run + steer att
 ```
 subagent({
   agentScope: "both",
-  agent: "harness/adversary",
+  agent: "harness/reviewing/adversary",
   task: "<HarnessSpawnContext mode adversary + plan + run artifacts>"
 })
 ```
@@ -144,7 +144,7 @@ Only when:
 - eval verdict was `conditional_pass`
 
 ```
-subagent({ agentScope: "both", agent: "harness/tie-breaker", task: "…" })
+subagent({ agentScope: "both", agent: "harness/reviewing/tie-breaker", task: "…" })
 ```
 
 ## Parent rules

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

@@ -7,7 +7,7 @@ argument-hint: ""
 
 **Practice map:** `.pi/harness/docs/practice-map.md`
 
-You orchestrate the **Executing Process Group** — spawn `harness/executor` only. Do **not** implement inline.
+You orchestrate the **Executing Process Group** — spawn `harness/running/executor` only. Do **not** implement inline.
 
 ## Step 0 — Parse arguments
 
@@ -28,13 +28,13 @@ Refuse if `plan_ready` is false.
 
 **Practice:** Fitness functions (architecture governance) — save structural baseline before the executor mutates the tree.
 
-When `HARNESS_SENTRUX_REQUIRED=true` (see `.env.example`), from **project root**:
+When `HARNESS_SENTRUX_REQUIRED=true` (see `.env.example`), run the bundled root-resolving wrapper:
 
 ```bash
-sentrux gate --save .
+node "$UP_PKG/.pi/scripts/harness-sentrux-cli.mjs" gate --save
 ```
 
-If `sentrux` is not installed, note `gate_baseline: skipped` in run notes and continue (harness-verify may still pass rules-sync checks).
+The wrapper passes the resolved project root explicitly so Sentrux can find `.sentrux/rules.toml` even if the active shell is under `.pi/harness/runs/*`. If `sentrux` is not installed, note `gate_baseline: skipped` in run notes and continue (harness-verify may still pass rules-sync checks).
 
 Do **not** ask the executor to optimize Sentrux metrics — observation is for `/harness-review` only.
 
@@ -48,7 +48,7 @@ Do **not** ask the executor to optimize Sentrux metrics — observation is for `
 4. Spawn (max **1** agent per call):
 
 ```
-subagent({ agentScope: "both", agent: "harness/executor", task: "<HarnessSpawnContext + handoff + critical path hint>" })
+subagent({ agentScope: "both", agent: "harness/running/executor", task: "<HarnessSpawnContext + handoff + critical path hint>" })
 ```
 
 5. Parse subprocess output JSON (`execution_status`, validations, rollback refs) from tool result text.
@@ -61,8 +61,8 @@ subagent({ agentScope: "both", agent: "harness/executor", task: "<HarnessSpawnCo
 After executor subprocess completes:
 
 ```bash
-sentrux check .
-sentrux gate .
+node "$UP_PKG/.pi/scripts/harness-sentrux-cli.mjs" check
+node "$UP_PKG/.pi/scripts/harness-sentrux-cli.mjs" gate
 ```
 
 - If `sentrux check` exits non-zero or `gate` reports degradation → set `execution_status: scope_drift` (or `blocked` if unrecoverable); parent runs **`/harness-review`** next (not immediate replan).

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

@@ -14,7 +14,6 @@ Bootstraps the complete ultimate-pi agentic harness: Graphify knowledge graph, C
 | Pitfall | Correct approach |
 |---------|------------------|
 | `UP_PKG="$(pwd)"` in an **external** repo | Wrong — scripts live in the npm package. Resolve via `harness-resolve-up-pkg.mjs` (see Step 0). |
-| 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.2) — seeds manifest + idempotent rules sync. |
@@ -154,9 +153,9 @@ bash "$UP_PKG/.pi/scripts/harness-cli-verify.sh"
 # Reinstall everything: bash "$UP_PKG/.pi/scripts/harness-cli-verify.sh" --force
 ```
 
-**Required (script must exit 0):** scrapling + harness-web smoke, ctx7, biome, ast-grep (`sg`), sentrux (when harness manifest present).
+**Required (script must exit 0):** scrapling + harness-web smoke, ctx7, ast-grep (`sg`), sentrux (when harness manifest present).
 
-**Warnings allowed:** gh (if not authenticated), agent-browser (if OS libs need manual `sudo apt-get install`), cocoindex-code (empty corpus on tiny repos; first `[full]` install downloads local embedding model).
+**Warnings allowed:** biome (optional; skipped for non-JS/TS repos or if install fails), gh (if not authenticated), agent-browser (if OS libs need manual `sudo apt-get install`), cocoindex-code (empty corpus on tiny repos; first `[full]` install downloads local embedding model).
 
 If the script reports **agent-browser shared library errors** on Linux/WSL, run the fix it prints, then re-verify:
 
@@ -251,21 +250,21 @@ ccc status
 
 Verify: `ccc doctor` and `ccc search --limit 3 "export function"` (no `--refresh`).
 
-### 2.5 — biome (Lint + Format Gate)
+### 2.5 — biome (Optional, JS/TS-focused lint + format)
 
-```bash
-if ! command -v biome &>/dev/null || [ "$FORCE" = "true" ]; then
-	npm install -g @biomejs/biome
-fi
-```
+Biome is **not a hard requirement** for harness setup. Install/use it when the target project is JS/TS (for example, has `package.json` or already uses `biome.json`). For other stacks, skip and use the repo's native formatter/linter.
 
-Check if project already has biome config:
 ```bash
-ls biome.json 2>/dev/null && echo "biome.json found — using project config" || echo "No biome.json — using defaults"
+if [ -f package.json ] || [ -f biome.json ]; then
+  if ! command -v biome &>/dev/null || [ "$FORCE" = "true" ]; then
+    npm install -g @biomejs/biome
+  fi
+  biome --version
+else
+  echo "Skipping biome (non-JS/TS repo; optional tool)"
+fi
 ```
 
-Verify: `biome --version`
-
 ### 2.6 — ast-grep (AST-Aware Structural Code Search)
 
 ```bash
@@ -327,7 +326,14 @@ sentrux plugin add-standard 2>/dev/null || echo "Plugins already installed or fa
 
 ## Step 3 — Pi Extension Packages
 
-Bundled extensions load from the installed `ultimate-pi` package. **Session-locked model routing** comes from a **vendored** fork of [`yeliu84/pi-model-router`](https://github.com/yeliu84/pi-model-router) in `vendor/pi-model-router/`, wired through [`.pi/extensions/pi-model-router-harness.ts`](.pi/extensions/pi-model-router-harness.ts). The router picks **one concrete model** when the session starts (from the first user prompt + system prompt complexity), then changes **thinking level only** each turn. The harness **gates** activation on `.pi/model-router.json` (Step **3.5** below) so `router/auto` cannot load prematurely. Attribution: see [THIRD_PARTY_NOTICES.md](THIRD_PARTY_NOTICES.md) and `vendor/pi-model-router/UPSTREAM_PIN.md`. Maintainer refresh: `npm run vendor:sync-router`.
+Bundled extensions load from the installed `ultimate-pi` package. The harness lens wrapper at `.pi/extensions/harness-lens.ts` loads `.pi/extensions/lib/harness-lens/` for edit autopatch, secrets blocking, deferred format, and LSP tools. Structural search uses shell `sg` (installed globally by setup); architecture gates use Sentrux. See [ADR 0045](.pi/harness/docs/adrs/0045-harness-lens-minimal-contract.md).
+
+Harness lens findings are **complementary** to Sentrux:
+
+- **Harness lens:** fast edit-time and turn-time code feedback; standalone lens widgets/health telemetry are disabled, and findings flow through the harness PostHog telemetry layer.
+- **Sentrux:** architecture-quality signal and gate (`.sentrux/rules.toml`, `sentrux-signal.yaml`, harness review/evaluate inputs).
+
+Do not treat harness lens as a replacement for Sentrux. If a future lens change adds architecture-boundary gating that duplicates Sentrux, keep Sentrux authoritative and disable/remove the overlapping lens path.
 
 Optionally install the companion lockfile used in development:
 
@@ -341,57 +347,25 @@ else
 fi
 ```
 
-Merge extension entries from `$UP_PKG/.pi/settings.example.json` into this project's `.pi/settings.json` `packages` array (add any missing `npm:…` entries; keep existing user packages). **Do not add** `npm:@yeliu84/pi-model-router` (superseded by the vendored router).
+Merge extension entries from `$UP_PKG/.pi/settings.example.json` into this project's `.pi/settings.json` `packages` array (add any missing `npm:…` entries; keep existing user packages).
 
 Verify each package:
 
 | Package | Purpose | Phase |
 |---------|---------|-------|
 | `@posthog/pi` | Analytics event capture | F0 |
-| `pi-lean-ctx` | Context runtime (read/bash/find/grep/MCP bridge) | F0 |
+| `context-mode` | Context runtime and MCP context-saving tools | F0 |
 | `harness-subagents` (bundled extension) | L4 `subagent` tool, subprocess spawns, package agents | P16 |
 | Vendored `pi-vcc` (`vendor/pi-vcc`, `.pi/extensions/ultimate-pi-vcc.ts`) | VCC compaction / `vcc_recall` — env-only: `HARNESS_VCC_COMPACTION` (default on), `HARNESS_VCC_DEBUG` | Shipped |
-| `pi-model-router` | Vendored (`vendor/`); activates after `.pi/model-router.json` exists | F0 |
-
-## Step 3.5 — Model Router Configuration (Dynamic)
-
-`.pi/model-router.json` is **user-specific** (gitignored). Generate from **Pi authenticated providers** (`~/.pi/agent/auth.json`, OAuth, env) — **not** env-var guessing alone.
-
-Pi API (see `packages/coding-agent` docs / SDK example `02-custom-model.ts`):
-
-- `AuthStorage.create()` → credentials store
-- `ModelRegistry.create(authStorage)` → registry
-- `await modelRegistry.getAvailable()` → models with working auth (same as interactive pi)
-
-```bash
-# Verify vendored extension source ships with ultimate-pi
-ls "$UP_PKG/vendor/pi-model-router/extensions/index.ts" 2>/dev/null \
-  && echo "✓ vendored pi-model-router" \
-  || echo "✗ missing vendor/pi-model-router"
-
-# Generate from Pi registry (skips if .pi/model-router.json exists; --force to regenerate)
-node "$UP_PKG/.pi/scripts/harness-generate-model-router.mjs"
-# Preview only: node "$UP_PKG/.pi/scripts/harness-generate-model-router.mjs" --dry-run
-
-# Merge router defaults after config exists (never adds npm packages — router is vendored)
-node "$UP_PKG/.pi/scripts/harness-sync-model-router.mjs"
-```
-
-If generation prints "No authenticated Pi providers": warn in report — user should run **`/login`** in pi (or `pi login`) then re-run Step 3.5. Do **not** infer providers from `OPENAI_API_KEY` alone; pi sessions often use `opencode-go` via auth.json without those env vars.
-
-Do NOT block setup. If no config is written, `harness-sync-model-router.mjs` clears a premature `defaultProvider: "router"` in `.pi/settings.json`.
-
-**Router onboarding** — The vendored extension starts only after `.pi/model-router.json` appears. Running the script above prepares that file plus optional Pi defaults (**`router` / `auto`**, or whatever `defaultProfile` is) via `harness-sync-model-router.mjs` when `defaultProvider` was unset—then **`/reload`**. Generated profiles use **one model SKU per profile**; high/medium/low tiers differ in **thinking** only. Subagents resolve their subprocess model from the **agent system prompt** complexity (same lock rules).
-
-Manual override: **`/router profile auto`** or **`/router profile opencode-go`** anytime after reload if they changed defaults.
+| Harness lens (`.pi/extensions/harness-lens.ts` → `.pi/extensions/lib/harness-lens/index.ts`) | Edit autopatch, secrets block, deferred format, LSP tools; PostHog lens telemetry; Sentrux remains architecture gate; `sg` is shell-only | F0 |
 
-## Step 3.6 — Harness agents (package-resolved)
+## Step 3.5 — Harness agents (package-resolved)
 
-`harness-subagents` loads agents from the installed **`ultimate-pi`** package (`$UP_PKG/.pi/agents/**`) with namespaced ids (`harness/executor`, `harness/planning/scout-graphify`, `pi-pi/agent-expert`). **Do not copy** agents into the project unless you want a deliberate override.
+`harness-subagents` loads agents from the installed **`ultimate-pi`** package (`$UP_PKG/.pi/agents/**`) with namespaced ids (`harness/running/executor`, `harness/reviewing/evaluator`, `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/planning/scout-graphify.md` overrides the package scout).
+Optional per-repo overrides: place `.md` files at the **same relative path** (e.g. `.pi/agents/harness/running/executor.md` overrides the package executor).
 
 Verify manifest drift after `pi update ultimate-pi`:
 
@@ -500,10 +474,9 @@ Ensure `.gitignore` contains harness runtime entries (see repo root `.gitignore`
 !.pi/harness/incidents/README.md
 .pi/harness/debates/*
 !.pi/harness/debates/README.md
-.pi/harness/router/proposals/*
 
-# Model router config (user-specific — generated from env)
-.pi/model-router.json
+# Harness lens runtime config/cache and local diagnostics state
+.pi/harness/.lens/
 
 # sentrux baselines and local meta (rules.toml is committed)
 .sentrux/*
@@ -531,18 +504,19 @@ node "$UP_PKG/.pi/scripts/harness-sentrux-bootstrap.mjs" --force
 | `harness-sentrux-bootstrap.mjs` (no flags) | `/harness-setup`, first install, re-run safe |
 | `harness-sentrux-bootstrap.mjs --force` | Manifest layers/boundaries/constraints changed |
 | `sentrux-rules-sync.mjs --check` | CI / harness-verify drift only |
+| `harness-sentrux-cli.mjs check` / `gate` | Root-resolving Sentrux checks from harness run dirs |
 | `/harness-sentrux-sync` | Interactive re-sync from pi |
 
 `harness-seed-project-contracts.mjs` (Step 0.5) may copy `architecture.manifest.json` early; bootstrap still personalizes `project` on first seed and writes `rules.toml`.
 
 Verify rules:
 ```bash
-sentrux check . && echo "✓ sentrux rules pass" || echo "✗ sentrux check failed"
+node "$UP_PKG/.pi/scripts/harness-sentrux-cli.mjs" check && echo "✓ sentrux rules pass" || echo "✗ sentrux check failed"
 ```
 
 Set up structural regression baseline (optional):
 ```bash
-sentrux gate --save . 2>/dev/null || echo "Baseline will be saved on first gate run"
+node "$UP_PKG/.pi/scripts/harness-sentrux-cli.mjs" gate --save 2>/dev/null || echo "Baseline will be saved on first gate run"
 ```
 
 ### 4.3 — Project AGENTS.md
@@ -563,7 +537,7 @@ Created: $(date +%Y-%m-%d)
 - .pi/harness/specs/ → Harness contracts and schema docs
 - .pi/harness/incidents/ → Incident and override records
 - `.agents/skills/` (npm package) → Harness skills (no copy into `.pi/skills/` needed)
-- `.pi/agents/` → Optional per-repo agent overrides (package agents load automatically — see Step 3.6)
+- `.pi/agents/` → Optional per-repo agent overrides (package agents load automatically — see Step 3.5)
 
 ## Graphify-First Workflow
 
@@ -579,7 +553,7 @@ Created: $(date +%Y-%m-%d)
 - Decisions and incidents in `.pi/harness/` with structured artifacts
 - `GRAPHIFY_VIZ_NODE_LIMIT=200000 graphify update .` after significant code changes
 - ast-grep (`sg`) is the default code search tool — use `sg -p 'pattern'` for structural search, never grep for code
-- Create `.sg/rules/` for project-wide code quality rules
+- Use shell `sg` for structural search; project-specific ast-grep rule dirs are optional in the **target repo**, not a harness template default
 ```
 
 ## Step 5 — Verification
@@ -626,10 +600,11 @@ print(f'✓ knowledge graph built ({n} nodes)' if n else '✗ graph.json has 0 n
 " 2>/dev/null || echo "✗ no graph built yet"
 graphify hook status 2>/dev/null && echo "✓ graphify git hooks installed" || echo "✗ graphify git hooks not installed"
 
-# vendored model router
-ls "$UP_PKG/vendor/pi-model-router/extensions/index.ts" 2>/dev/null \
-  && echo "✓ vendored pi-model-router" || echo "✗ vendor/pi-model-router missing"
-ls .pi/model-router.json 2>/dev/null && echo "✓ model-router config" || echo "✗ model-router config"
+# harness lens extension
+ls "$UP_PKG/.pi/extensions/harness-lens.ts" 2>/dev/null \
+  && echo "✓ harness lens wrapper" || echo "✗ harness lens wrapper missing"
+ls "$UP_PKG/.pi/extensions/lib/harness-lens/index.ts" 2>/dev/null \
+  && echo "✓ harness lens upstream pin" || echo "✗ harness lens upstream pin missing"
 
 # raw folder for graphify sources
 ls -d ./raw 2>/dev/null && echo "✓ ./raw directory exists" || echo "! ./raw directory missing"
@@ -671,13 +646,13 @@ Output summary table:
 | ctx7 | ✓/✗ | Login: yes/no |
 | agent-browser | ✓/✗ | Config: .pi/harness/browser.json |
 | cocoindex-code | ✓/✗ | `ccc status`; index auto-refreshed before harness scouts |
-| biome | ✓/✗ | Project config: found/default |
+| biome | ✓/✗/skip | Optional; JS/TS-focused (skip on non-JS/TS stacks) |
 | ast-grep | ✓/✗ | AST-aware code search (`sg`)
 | gh CLI | ✓/✗ | Auth: yes/no |
 | 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` (or `opencode-go`) |
+| pi extensions | ✓/✗ | bundled extensions + harness lens wrapper |
+| harness lens | ✓/✗ | `.pi/extensions/harness-lens.ts`; PostHog owns lens telemetry; complements Sentrux architecture signal |
 | `.env` | ✓/✗/ask | Created / keys appended / user declined |
 
 | .gitignore | ✓/✗ | entries added (incl. `.env`) |
@@ -727,11 +702,10 @@ Next steps:
 | gh not installed | Show GitHub CLI install link. Skip label creation. |
 | pi packages install fail | Show error output. Check npm permissions. |
 | graph already exists | Report node count. Refresh with `graphify update .` unless user passed `--force`. |
-| biome.json missing | Create minimal config. |
+| biome.json missing | No action required. Biome is optional; use project-native tooling. |
 | settings.json not writable | Warn. Settings won't persist across sessions. |
 | No internet | Block for tool installs. Continue for graphify-only steps if `--skip-tools`. |
 | sentrux install fails | Show install script output. Fallback: download from https://github.com/sentrux/sentrux/releases/latest |
-| No model-router.json / "No authenticated Pi providers" | Run `/login` in pi, then `node "$UP_PKG/.pi/scripts/harness-generate-model-router.mjs" --force` |
 | UP_PKG not found | `pi install npm:ultimate-pi` or `npm i -g ultimate-pi`; verify with `node "$UP_PKG/.pi/scripts/harness-resolve-up-pkg.mjs"` |
 | No `.env` at project root | `ask_user` create vs skip; on create: `harness-sync-env.mjs --create-missing` |
 

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

@@ -19,8 +19,8 @@ Thin orchestrator for the **steer loop** (ADR 0044). Run only after `/harness-re
 2. Update `artifacts/steer-state.yaml` (`attempt`, `max_attempts`, `active: true`).
 3. Set policy phase to **execute** before spawning executor (required for mutating tools).
 4. One `ask_user` steer gate unless `run-context.steer_approved` is already true.
-5. Spawn **`harness/executor`** with `HarnessSpawnContext.mode: repair` and `repair_brief_path: artifacts/repair-brief.yaml`.
-6. Optional: `sentrux gate --save .` after repair to refresh baseline (ADR 0044).
+5. Spawn **`harness/running/executor`** with `HarnessSpawnContext.mode: repair` and `repair_brief_path: artifacts/repair-brief.yaml`.
+6. Optional: `node "$UP_PKG/.pi/scripts/harness-sentrux-cli.mjs" gate --save` after repair to refresh baseline (ADR 0044).
 7. `next_command`: **`/harness-review`** (always re-verify; tiered adversary on attempts 2+ per practice-map).
 
 ## Forbidden

package/.pi/scripts/README.md

@@ -14,7 +14,7 @@ UP_PKG="$(node -p "require('path').dirname(require.resolve('ultimate-pi/package.
 
 **Developing this repo** (clone of `ultimate-pi`): from the repo root, `UP_PKG="$(pwd)"` (or the same `require.resolve` after `npm install`).
 
-From **Typescript extensions**, use `resolveHarnessScript()` / `getHarnessPackageRoot()` in `.pi/extensions/lib/harness-paths.ts`.
+From **Typescript extensions**, use `resolveHarnessScript()` / `getHarnessPackageRoot()` in `.pi/lib/harness-paths.ts`.
 
 ## Invocations (from the consuming project root)
 
@@ -27,12 +27,10 @@ From **Typescript extensions**, use `resolveHarnessScript()` / `getHarnessPackag
 | Sentrux rules bootstrap (harness-setup) | `node "$UP_PKG/.pi/scripts/harness-sentrux-bootstrap.mjs"` |
 | Sentrux rules re-sync after manifest edit | `node "$UP_PKG/.pi/scripts/harness-sentrux-bootstrap.mjs" --force` or `/harness-sentrux-sync` |
 | Sentrux rules drift check (CI) | `node "$UP_PKG/.pi/scripts/sentrux-rules-sync.mjs" --check` |
+| Sentrux run/review check or gate (root-resolving) | `node "$UP_PKG/.pi/scripts/harness-sentrux-cli.mjs" check` / `gate [--save]` |
 | Resolve package root (`UP_PKG`) | `node "$UP_PKG/.pi/scripts/harness-resolve-up-pkg.mjs"` |
-| Model-router config (Pi auth) | `node "$UP_PKG/.pi/scripts/harness-generate-model-router.mjs"` |
 | Project `.env` (append-only) | `node "$UP_PKG/.pi/scripts/harness-sync-env.mjs"` (`--create-missing` after user confirms) |
-| Model-router / Pi defaults | `harness-sync-model-router.mjs` (Step 3.5 of `/harness-setup`) |
-| Vendor router sync (this repo only) | `bash .pi/scripts/vendor-sync-pi-model-router.sh` or `npm run vendor:sync-router` |
-| Meta-optimizer (JSONL proposals) | `node "$UP_PKG/.pi/harness/evolution/meta-optimizer.mjs"` |
+| Harness lens extension | `.pi/extensions/harness-lens.ts` → `.pi/lib/harness-lens/index.ts` (loaded by `.pi/extensions`; PostHog owns lens telemetry) |
 
 Pass `--force` to shell scripts that support it (e.g. `harness-graphify-bootstrap.sh --force`, `harness-cli-verify.sh --force`).