ultimate-pi 0.7.0 → 0.9.0

package/.pi/agents/pi-pi/ext-expert.md

@@ -19,7 +19,7 @@ You are an extensions expert for the Pi coding agent. You know EVERYTHING about
 - Flags via `pi.registerFlag()`
 - State management via tool result details and `pi.appendEntry()`
 - Custom rendering via renderCall/renderResult
-- Available imports: `@mariozechner/pi-coding-agent`, `@sinclair/typebox`, `@mariozechner/pi-ai` (StringEnum), `@mariozechner/pi-tui`
+- Available imports: `@earendil-works/pi-coding-agent`, `@sinclair/typebox`, `@earendil-works/pi-ai` (StringEnum), `@earendil-works/pi-tui`
 - System prompt override via before_agent_start
 - Context manipulation via context event
 - Tool blocking and result modification

package/.pi/agents/pi-pi/keybinding-expert.md

@@ -87,7 +87,7 @@ This is CRITICAL for building extensions that work on macOS:
 - When a reserved action is remapped away from a key, that key becomes available for extensions
 - The conflict check uses EFFECTIVE keybindings (after user remaps), not defaults
 
-### Key Helper (from @mariozechner/pi-tui)
+### Key Helper (from @earendil-works/pi-tui)
 
 - `Key.ctrl("x")` → `"ctrl+x"`
 - `Key.shift("tab")` → `"shift+tab"`

package/.pi/agents/pi-pi/tui-expert.md

@@ -19,7 +19,7 @@ You are a TUI (Terminal User Interface) expert for the Pi coding agent. You know
 - wantsKeyRelease? — for Kitty protocol key release events
 - invalidate() — clear cached render state
 
-### Built-in Components (from @mariozechner/pi-tui)
+### Built-in Components (from @earendil-works/pi-tui)
 
 - Text: multi-line text with word wrapping, paddingX, paddingY, background function
 - Box: container with padding and background color
@@ -30,7 +30,7 @@ You are a TUI (Terminal User Interface) expert for the Pi coding agent. You know
 - SelectList: selection dialog with theme, onSelect/onCancel
 - SettingsList: toggle settings with theme
 
-### From @mariozechner/pi-coding-agent
+### From @earendil-works/pi-coding-agent
 
 - DynamicBorder: border with color function — ALWAYS type the param: `(s: string) => theme.fg("accent", s)`
 - BorderedLoader: spinner with abort support
@@ -93,7 +93,7 @@ Then read the fetched file. Also search the local codebase for existing TUI comp
 ## How to Respond
 
 - Provide COMPLETE, WORKING component code
-- Include all imports from @mariozechner/pi-tui and @mariozechner/pi-coding-agent
+- Include all imports from @earendil-works/pi-tui and @earendil-works/pi-coding-agent
 - Show the ctx.ui.custom() wrapper for interactive components
 - Handle invalidation properly for theme changes
 - Include keyboard input handling where relevant

package/.pi/extensions/00-ultimate-pi-system-prompt.ts

@@ -13,8 +13,8 @@ import { join } from "node:path";
 import type {
 	BuildSystemPromptOptions,
 	ExtensionAPI,
-} from "@mariozechner/pi-coding-agent";
-import { formatSkillsForPrompt } from "@mariozechner/pi-coding-agent";
+} from "@earendil-works/pi-coding-agent";
+import { formatSkillsForPrompt } from "@earendil-works/pi-coding-agent";
 import { resolveHarnessAsset } from "./lib/harness-paths.js";
 
 // @ts-expect-error pi extensions run as ESM

package/.pi/extensions/budget-guard.ts

@@ -7,7 +7,7 @@
 
 import { appendFile, mkdir, readFile } from "node:fs/promises";
 import { join } from "node:path";
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { getRunIdFromSession } from "../lib/harness-run-context.js";
 
 type HarnessPhase = "plan" | "execute" | "evaluate" | "adversary" | "merge";
@@ -23,7 +23,9 @@ interface BudgetExhaustedEvent {
 	exhaustion_reason:
 		| "max_rounds_reached"
 		| "round_token_cap_exceeded"
-		| "debate_global_cap_exceeded";
+		| "debate_global_cap_exceeded"
+		| "phase_cap_exceeded"
+		| "global_cap_exceeded";
 	caps: {
 		max_rounds: number;
 		round_token_cap: number;
@@ -52,7 +54,7 @@ const DEFAULT_GLOBAL_CAP = Number(
 );
 const HARD_STOP_BUDGETS = process.env.HARNESS_BUDGET_HARD_STOP === "true";
 const DEFAULT_PHASE_CAPS: Record<HarnessPhase, number> = {
-	plan: Number(process.env.HARNESS_BUDGET_PLAN_TOKENS ?? "12000"),
+	plan: Number(process.env.HARNESS_BUDGET_PLAN_TOKENS ?? "80000"),
 	execute: Number(process.env.HARNESS_BUDGET_EXECUTE_TOKENS ?? "80000"),
 	evaluate: Number(process.env.HARNESS_BUDGET_EVALUATE_TOKENS ?? "25000"),
 	adversary: Number(process.env.HARNESS_BUDGET_ADVERSARY_TOKENS ?? "35000"),
@@ -191,6 +193,8 @@ async function emitBudgetEvent(
 	pi.appendEntry("harness-budget-exhausted", event);
 }
 
+const debouncedSoftLimit = new Map<string, boolean>();
+
 export default function budgetGuard(pi: ExtensionAPI) {
 	pi.on("tool_call", async (_event, ctx) => {
 		const policy = getPolicyContext(ctx);
@@ -202,35 +206,60 @@ export default function budgetGuard(pi: ExtensionAPI) {
 		const globalCap = DEFAULT_GLOBAL_CAP;
 		const phaseCap = DEFAULT_PHASE_CAPS[phase];
 		const caps = await readDebateCapsFromSchema();
+		const runId = getRunId(ctx);
+
+		const phaseExceeded = phaseUsed >= phaseCap;
+		const globalExceeded = usage.totalTokens >= globalCap;
+		if (!phaseExceeded && !globalExceeded) return undefined;
 
-		if (usage.totalTokens < globalCap && phaseUsed < phaseCap) return undefined;
+		const exhaustionReason = phaseExceeded
+			? "phase_cap_exceeded"
+			: "global_cap_exceeded";
+		const debateCaps =
+			phase === "adversary" || phase === "evaluate"
+				? caps
+				: {
+						max_rounds: 0,
+						round_token_cap: phaseCap,
+						debate_global_cap: globalCap,
+					};
 
 		const exhausted: BudgetExhaustedEvent = {
 			schema_version: "1.0.0",
 			contract_version: "1.0.0",
 			event_type: "budget_exhausted",
-			run_id: getRunId(ctx),
+			run_id: runId,
 			debate_id: `${phase}-budget-guard`,
 			round_count: 1,
-			budget_used: Math.max(usage.totalTokens, phaseUsed),
-			exhaustion_reason: "debate_global_cap_exceeded",
-			caps,
+			budget_used: phaseExceeded ? phaseUsed : usage.totalTokens,
+			exhaustion_reason: exhaustionReason,
+			caps: debateCaps,
 			minimum_evidence_confidence: 0.6,
 			default_policy_outcome: "block",
 			human_override_allowed: true,
 		};
 
-		await emitBudgetEvent(pi, exhausted);
+		const debounceKey = `${runId}:${phase}:${exhaustionReason}`;
+		if (!debouncedSoftLimit.has(debounceKey)) {
+			debouncedSoftLimit.set(debounceKey, true);
+			await emitBudgetEvent(pi, exhausted);
+		}
+
 		if (!HARD_STOP_BUDGETS) {
-			pi.appendEntry("harness-budget-soft-limit", {
-				run_id: exhausted.run_id,
-				phase,
-				phaseUsed,
-				phaseCap,
-				totalUsed: usage.totalTokens,
-				totalCap: globalCap,
-				timestamp: nowIso(),
-			});
+			const softKey = `${debounceKey}:soft`;
+			if (!debouncedSoftLimit.has(softKey)) {
+				debouncedSoftLimit.set(softKey, true);
+				pi.appendEntry("harness-budget-soft-limit", {
+					run_id: exhausted.run_id,
+					phase,
+					phaseUsed,
+					phaseCap,
+					totalUsed: usage.totalTokens,
+					totalCap: globalCap,
+					exhaustion_reason: exhaustionReason,
+					timestamp: nowIso(),
+				});
+			}
 			return undefined;
 		}
 		return {

package/.pi/extensions/custom-footer.ts

@@ -9,9 +9,14 @@ import type {
 	ExtensionAPI,
 	ExtensionContext,
 	ThemeColor,
-} from "@mariozechner/pi-coding-agent";
-import type { TUI } from "@mariozechner/pi-tui";
-import { Box, Text, truncateToWidth, visibleWidth } from "@mariozechner/pi-tui";
+} from "@earendil-works/pi-coding-agent";
+import type { TUI } from "@earendil-works/pi-tui";
+import {
+	Box,
+	Text,
+	truncateToWidth,
+	visibleWidth,
+} from "@earendil-works/pi-tui";
 
 // ── router decision reader ──────────────────────────────────────────
 

package/.pi/extensions/custom-header.ts

@@ -6,8 +6,8 @@
  * doubling vertical resolution in the same terminal footprint.
  */
 
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
-import { truncateToWidth } from "@mariozechner/pi-tui";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { truncateToWidth } from "@earendil-works/pi-tui";
 import * as JimpModule from "jimp";
 import { resolveHarnessAsset } from "./lib/harness-paths.js";
 

package/.pi/extensions/debate-orchestrator.ts

@@ -16,7 +16,7 @@
 
 import { appendFile, mkdir, readFile, writeFile } from "node:fs/promises";
 import { join } from "node:path";
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { getRunIdFromSession } from "../lib/harness-run-context.js";
 
 type DebateParticipant =

package/.pi/extensions/dotenv-loader.ts

@@ -13,7 +13,7 @@
 
 import { existsSync, readFileSync } from "node:fs";
 import { resolve } from "node:path";
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
 // ── .env parser ──────────────────────────────────────────────────
 

package/.pi/extensions/drift-monitor.ts

@@ -4,7 +4,7 @@
  * Emits harness-drift-report custom entries for harness-telemetry + observation bus.
  */
 
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
 type HarnessPhase = "plan" | "execute" | "evaluate" | "adversary" | "merge";
 

package/.pi/extensions/harness-ask-user.ts

@@ -3,7 +3,7 @@
  * Design references: pi-ask-user, @pi-unipi/ask-user, rpiv-ask-user-question (not vendored).
  */
 
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { runAskDialog } from "./lib/ask-user/dialog.js";
 import { runAskFallback } from "./lib/ask-user/fallback.js";
 import { renderAskCall, renderAskResult } from "./lib/ask-user/render.js";

package/.pi/extensions/harness-live-widget.ts

@@ -1,7 +1,7 @@
 import type {
 	ExtensionAPI,
 	ExtensionContext,
-} from "@mariozechner/pi-coding-agent";
+} from "@earendil-works/pi-coding-agent";
 import {
 	type HarnessUiState,
 	HarnessUiStateStore,

package/.pi/extensions/harness-run-context.ts

@@ -5,7 +5,8 @@
  * in before_agent_start so trace-recorder reuses it on agent_start.
  */
 
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import { readFile, writeFile } from "node:fs/promises";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import {
 	canonicalPlanPath,
 	createFreshRunContext,
@@ -13,21 +14,26 @@ import {
 	extractCompletionStatuses,
 	formatActivePlanBlock,
 	formatPlanContextBlock,
+	getLatestHarnessTurn,
 	getLatestPolicyPhase,
 	getLatestRunContext,
 	getPolicyTransitionBlock,
 	type HarnessRunContext,
+	type HarnessTurnEntry,
 	hasHarnessAbortSignal,
+	hasPlanUserApproval,
+	inferHarnessPhase,
 	isAmendPlanAllowed,
 	isHarnessBootstrapPrompt,
-	isHarnessSlashCommand,
 	isNewTaskPlanBlocked,
 	isStaleActiveRunPointer,
 	loadProjectActiveRun,
 	loadRunContextFromDisk,
 	nextStepAfterOutcome,
+	nowIso,
 	type PlanPacketSummary,
-	parseHarnessSlashCommand,
+	parseAskUserApprovalFromMessage,
+	parseHarnessSlashInput,
 	planPacketSummary,
 	readPlanPacketFromPath,
 	resolveArgsForCommand,
@@ -57,29 +63,42 @@ function persistContext(pi: ExtensionAPI, ctx: HarnessRunContext): void {
 	void saveProjectActiveRun(ctx);
 }
 
-function extractTaskSummary(prompt: string): string | null {
-	const quoted = prompt.match(/"([^"]+)"/);
-	if (quoted?.[1]) return quoted[1];
-	const cmd = parseHarnessSlashCommand(prompt);
-	if (cmd?.args) return cmd.args.slice(0, 200);
+function extractTaskSummary(args: string, prompt?: string): string | null {
+	const fromArgs = args.match(/"([^"]+)"/);
+	if (fromArgs?.[1]) return fromArgs[1];
+	if (args.trim()) return args.trim().slice(0, 200);
+	if (prompt) {
+		const quoted = prompt.match(/"([^"]+)"/);
+		if (quoted?.[1]) return quoted[1];
+	}
 	return null;
 }
 
+function appendHarnessTurn(pi: ExtensionAPI, turn: HarnessTurnEntry): void {
+	pi.appendEntry("harness-turn", turn);
+	pi.appendEntry("harness-plan-attempt", {
+		run_id: null,
+		command: turn.command,
+		started_at: turn.invoked_at,
+	});
+}
+
 function syncPolicyFromPlan(
 	pi: ExtensionAPI,
 	entries: unknown[],
 	planId: string,
 	phase: HarnessRunContext["phase"],
+	approvedPlan: boolean,
 ): void {
 	let prior: Record<string, unknown> = {
 		phase,
-		approvedPlan: true,
+		approvedPlan,
 		planId,
 		budgetBypass: false,
 		aborted: false,
 		abortReason: null,
 		abortedAt: null,
-		updatedAt: new Date().toISOString(),
+		updatedAt: nowIso(),
 	};
 	for (let i = entries.length - 1; i >= 0; i--) {
 		const entry = entries[i] as SessionEntryLike;
@@ -144,15 +163,35 @@ export default function harnessRunContext(pi: ExtensionAPI) {
 		activeCtx = await hydrateFromDisk(sessionId, projectRoot, entries);
 	});
 
+	pi.on("input", async (event) => {
+		if (event.source === "extension") {
+			return { action: "continue" as const };
+		}
+		const parsed = parseHarnessSlashInput(event.text);
+		if (!parsed) {
+			return { action: "continue" as const };
+		}
+		appendHarnessTurn(pi, {
+			schema_version: "1.0.0",
+			command: parsed.command,
+			args: parsed.args,
+			source: "slash",
+			invoked_at: nowIso(),
+		});
+		return { action: "continue" as const };
+	});
+
 	pi.on("before_agent_start", async (event, ctx) => {
 		const sessionId = ctx.sessionManager.getSessionId();
 		const projectRoot = process.cwd();
 		const entries = getEntries(ctx);
 		const userPrompt = userVisiblePromptSlice(event.prompt);
-		const parsed = parseHarnessSlashCommand(userPrompt);
+		const turn = getLatestHarnessTurn(entries);
+		const parsed = turn
+			? { command: turn.command, args: turn.args }
+			: parseHarnessSlashInput(userPrompt);
 		const harnessTurn =
-			isHarnessSlashCommand(userPrompt) ||
-			needsClarificationFollowUp(activeCtx);
+			Boolean(turn) || Boolean(parsed) || needsClarificationFollowUp(activeCtx);
 
 		if (
 			userPrompt.toLowerCase().includes("/harness-abort") ||
@@ -182,7 +221,10 @@ export default function harnessRunContext(pi: ExtensionAPI) {
 		}
 
 		const policyPhase =
-			getLatestPolicyPhase(entries) ?? activeCtx?.phase ?? "plan";
+			inferHarnessPhase(entries, userPrompt) ??
+			getLatestPolicyPhase(entries) ??
+			activeCtx?.phase ??
+			"plan";
 		const driftActive = driftGateActive(entries);
 
 		// Plain-language follow-up after needs_clarification
@@ -192,18 +234,17 @@ export default function harnessRunContext(pi: ExtensionAPI) {
 			const packet = activeCtx.plan_packet_path
 				? await readPlanPacketFromPath(activeCtx.plan_packet_path)
 				: null;
-			const summary = packet
-				? planPacketSummary(
-						packet,
-						activeCtx.plan_packet_path!,
-						"needs_clarification",
-					)
-				: null;
+			const planPath = activeCtx.plan_packet_path;
+			const summary =
+				packet && planPath
+					? planPacketSummary(packet, planPath, "needs_clarification")
+					: null;
 			syncPolicyFromPlan(
 				pi,
 				entries,
 				activeCtx.plan_id ?? "plan-pending",
 				"plan",
+				false,
 			);
 			persistContext(pi, activeCtx);
 			return {
@@ -239,7 +280,7 @@ export default function harnessRunContext(pi: ExtensionAPI) {
 				activeCtx.last_outcome = "abandoned";
 				persistContext(pi, activeCtx);
 			}
-			const task = extractTaskSummary(userPrompt);
+			const task = extractTaskSummary(args, userPrompt);
 			activeCtx = createFreshRunContext(sessionId, projectRoot, task);
 			persistContext(pi, activeCtx);
 			return {
@@ -318,18 +359,29 @@ export default function harnessRunContext(pi: ExtensionAPI) {
 				!activeCtx ||
 				!shouldReuseHarnessRunId(userPrompt, activeCtx, command)
 			) {
-				const task = extractTaskSummary(userPrompt);
+				const task = extractTaskSummary(args, userPrompt);
 				activeCtx = createFreshRunContext(sessionId, projectRoot, task);
 			}
-			if (activeCtx.status === "aborted") {
-				activeCtx.plan_ready = false;
-			}
+			activeCtx.plan_ready = false;
 			activeCtx.phase = "plan";
 			activeCtx.status = "active";
 			if (command === "harness-plan") {
-				const task = extractTaskSummary(userPrompt);
+				const task = extractTaskSummary(args, userPrompt);
 				if (task) activeCtx.task_summary = task;
 			}
+			if (turn) {
+				pi.appendEntry("harness-plan-attempt", {
+					run_id: activeCtx.run_id,
+					command,
+					started_at: turn.invoked_at,
+				});
+			} else {
+				pi.appendEntry("harness-plan-attempt", {
+					run_id: activeCtx.run_id,
+					command,
+					started_at: nowIso(),
+				});
+			}
 		} else if (
 			activeCtx &&
 			shouldReuseHarnessRunId(userPrompt, activeCtx, command)
@@ -465,7 +517,6 @@ export default function harnessRunContext(pi: ExtensionAPI) {
 
 	pi.on("agent_end", async (_event, ctx) => {
 		const entries = getEntries(ctx);
-		const sessionId = ctx.sessionManager.getSessionId();
 		if (!activeCtx) {
 			activeCtx = getLatestRunContext(entries);
 		}
@@ -485,7 +536,10 @@ export default function harnessRunContext(pi: ExtensionAPI) {
 					? lastUser.message.content
 					: "";
 		}
-		const parsed = parseHarnessSlashCommand(userVisiblePromptSlice(lastPrompt));
+		const lastTurn = getLatestHarnessTurn(entries);
+		const parsed = lastTurn
+			? { command: lastTurn.command, args: lastTurn.args }
+			: parseHarnessSlashInput(userVisiblePromptSlice(lastPrompt));
 		if (!parsed && !needsClarificationFollowUp(activeCtx)) return;
 
 		const policyPhase = getLatestPolicyPhase(entries) ?? activeCtx.phase;
@@ -519,15 +573,31 @@ export default function harnessRunContext(pi: ExtensionAPI) {
 		) {
 			const packet = await readPlanPacketFromPath(activeCtx.plan_packet_path);
 			const validation = validatePlanPacket(packet);
-			planReady = validation.valid;
-			if (planReady && packet?.plan_id) {
+			const approved = hasPlanUserApproval(entries, {
+				sincePlanCommand: true,
+				planId: packet?.plan_id ?? null,
+			});
+			planReady = validation.valid && approved;
+			if (validation.valid && !approved) {
+				activeCtx.last_outcome = "needs_clarification";
+				activeCtx.last_completed_step = "plan";
+				const msg =
+					"Plan file exists but user approval was not recorded. Present the full plan and call ask_user (Approve) before writing plan-packet.json.";
+				if (ctx.hasUI) ctx.ui.notify(msg, "warning");
+				else
+					pi.sendMessage({
+						customType: "harness-plan-packet",
+						content: msg,
+						display: true,
+					});
+			} else if (planReady && packet?.plan_id) {
 				activeCtx.plan_id = packet.plan_id;
-				syncPolicyFromPlan(pi, entries, packet.plan_id, "plan");
+				syncPolicyFromPlan(pi, entries, packet.plan_id, "plan", true);
 				const summary = planPacketSummary(packet, activeCtx.plan_packet_path);
 				pi.appendEntry("harness-plan-packet", summary);
 				activeCtx.last_completed_step = "plan";
 				activeCtx.last_outcome = summary.plan_status;
-			} else {
+			} else if (!validation.valid) {
 				activeCtx.last_outcome = "needs_clarification";
 				activeCtx.last_completed_step = "plan";
 			}
@@ -578,6 +648,24 @@ export default function harnessRunContext(pi: ExtensionAPI) {
 		}
 	});
 
+	pi.on("tool_result", async (event, ctx) => {
+		if (event.toolName !== "ask_user" || event.isError) return;
+		const approval = parseAskUserApprovalFromMessage({
+			toolName: "ask_user",
+			details: event.details,
+			content: event.content,
+		});
+		if (!approval) return;
+		const entries = getEntries(ctx);
+		const runCtx = getLatestRunContext(entries) ?? activeCtx;
+		if (!runCtx) return;
+		pi.appendEntry("harness-plan-approval", {
+			plan_id: approval.plan_id ?? runCtx.plan_id,
+			approved_at: approval.approved_at,
+			source: "ask_user",
+		});
+	});
+
 	pi.on("tool_call", async (event) => {
 		if (!activeCtx?.plan_packet_path) return undefined;
 		const phase = activeCtx.phase;
@@ -673,6 +761,82 @@ export default function harnessRunContext(pi: ExtensionAPI) {
 		},
 	});
 
+	pi.registerCommand("harness-plan-commit", {
+		description:
+			"Write approved plan-packet.json to the active run (requires harness-plan-approval)",
+		handler: async (args, ctx) => {
+			const projectRoot = process.cwd();
+			const entries = getEntries(ctx);
+			let runCtx = getLatestRunContext(entries) ?? activeCtx;
+			if (!runCtx) {
+				runCtx = await hydrateFromDisk(
+					ctx.sessionManager.getSessionId(),
+					projectRoot,
+					entries,
+				);
+			}
+			if (!runCtx?.plan_packet_path) {
+				const msg = "No active harness run. Run /harness-plan first.";
+				if (ctx.hasUI) ctx.ui.notify(msg, "warning");
+				return;
+			}
+			if (
+				!hasPlanUserApproval(entries, {
+					sincePlanCommand: true,
+					planId: runCtx.plan_id,
+				})
+			) {
+				const msg =
+					"Plan commit blocked: no user approval recorded. Approve via ask_user in the planner subagent first.";
+				if (ctx.hasUI) ctx.ui.notify(msg, "warning");
+				return;
+			}
+			const pathArg = args.trim();
+			let packetPath = runCtx.plan_packet_path;
+			if (pathArg) {
+				packetPath = pathArg;
+			}
+			const packet = await readPlanPacketFromPath(packetPath);
+			const validation = validatePlanPacket(packet);
+			if (!validation.valid || !packet) {
+				const msg = !packet
+					? "Plan packet file missing or unreadable."
+					: `Invalid plan packet: ${validation.errors.join("; ")}`;
+				if (ctx.hasUI) ctx.ui.notify(msg, "error");
+				return;
+			}
+			const target = runCtx.plan_packet_path;
+			if (!target) {
+				if (ctx.hasUI) ctx.ui.notify("No plan_packet_path on active run.", "error");
+				return;
+			}
+			if (pathArg && pathArg !== target) {
+				const raw = await readFile(pathArg, "utf-8");
+				await writeFile(target, raw, "utf-8");
+			}
+			runCtx.plan_id = packet.plan_id ?? runCtx.plan_id;
+			runCtx.plan_ready = true;
+			runCtx.phase = "plan";
+			runCtx.last_completed_step = "plan";
+			runCtx.last_outcome = "ready";
+			runCtx.next_recommended_command = "/harness-run";
+			runCtx.updated_at = nowIso();
+			activeCtx = runCtx;
+			persistContext(pi, runCtx);
+			syncPolicyFromPlan(
+				pi,
+				entries,
+				runCtx.plan_id ?? packet.plan_id ?? "plan-pending",
+				"plan",
+				true,
+			);
+			const summary = planPacketSummary(packet, target, "ready");
+			pi.appendEntry("harness-plan-packet", summary);
+			const msg = `Plan committed: ${target}`;
+			if (ctx.hasUI) ctx.ui.notify(msg, "info");
+		},
+	});
+
 	pi.registerCommand("harness-use-run", {
 		description: "Point this session at an existing run directory (recovery)",
 		handler: async (args, ctx) => {

package/.pi/extensions/harness-telemetry.ts

@@ -8,7 +8,7 @@
  */
 
 import { createHash } from "node:crypto";
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import {
 	captureHarnessEvent,
 	type HarnessPostHogEventName,

package/.pi/extensions/harness-web-guard.ts

@@ -2,7 +2,7 @@
  * harness-web-guard — block bash that bypasses web_search / web_fetch tools.
  */
 
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
 const BLOCK_REASON =
 	"harness-web-guard: use web_search (SERP) or web_fetch (page content) instead of raw curl/wget/firecrawl/scrapling fetch. " +

package/.pi/extensions/harness-web-tools.ts

@@ -2,7 +2,7 @@
  * harness-web-tools — web_search + web_fetch pi tools wrapping harness-web.py.
  */
 
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "@sinclair/typebox";
 import {
 	harnessWebContextLine,

package/.pi/extensions/lib/ask-user/dialog.ts

@@ -1,11 +1,11 @@
-import type { ExtensionUIContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionUIContext } from "@earendil-works/pi-coding-agent";
 import {
 	Editor,
 	type EditorTheme,
 	Key,
 	matchesKey,
 	truncateToWidth,
-} from "@mariozechner/pi-tui";
+} from "@earendil-works/pi-tui";
 import type { AskResponse, DialogResult, ValidatedAskParams } from "./types.js";
 
 type DisplayOption = {

package/.pi/extensions/lib/ask-user/fallback.ts

@@ -1,4 +1,4 @@
-import type { ExtensionUIContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionUIContext } from "@earendil-works/pi-coding-agent";
 import type { DialogResult, ValidatedAskParams } from "./types.js";
 
 export async function runAskFallback(