ultimate-pi 0.7.0 → 0.9.0

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

@@ -1,9 +1,9 @@
-import type { AgentToolResult } from "@mariozechner/pi-agent-core";
+import type { AgentToolResult } from "@earendil-works/pi-agent-core";
 import type {
 	Theme,
 	ToolRenderResultOptions,
-} from "@mariozechner/pi-coding-agent";
-import { Text } from "@mariozechner/pi-tui";
+} from "@earendil-works/pi-coding-agent";
+import { Text } from "@earendil-works/pi-tui";
 import type { AskToolDetails } from "./types.js";
 
 export function renderAskCall(

package/.pi/extensions/lib/harness-subagents/agent-loader.ts

@@ -5,7 +5,7 @@
 import { createHash } from "node:crypto";
 import { type Dirent, existsSync, readdirSync, readFileSync } from "node:fs";
 import { join, relative } from "node:path";
-import { getAgentDir } from "@mariozechner/pi-coding-agent";
+import { getAgentDir } from "@earendil-works/pi-coding-agent";
 import { parseAgentMarkdown } from "./agent-parser.js";
 import type { AgentConfig } from "./vendored/types.js";
 

package/.pi/extensions/lib/harness-subagents/agent-parser.ts

@@ -2,7 +2,7 @@
  * Parse harness agent .md files into AgentConfig (path id = posix relative path).
  */
 
-import { parseFrontmatter } from "@mariozechner/pi-coding-agent";
+import { parseFrontmatter } from "@earendil-works/pi-coding-agent";
 import { BUILTIN_TOOL_NAMES } from "./vendored/agent-types.js";
 import type {
 	AgentConfig,

package/.pi/extensions/lib/harness-subagents/blackboard-tool.ts

@@ -2,7 +2,7 @@
  * Orchestrator blackboard tool (list/read/query/wait/delete).
  */
 
-import { defineTool, type ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import { defineTool, type ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "@sinclair/typebox";
 import type { Blackboard } from "./blackboard.js";
 import type { BlackboardQuery } from "./types-blackboard.js";

package/.pi/extensions/lib/harness-subagents/harness-subagent-policy.ts

@@ -0,0 +1,134 @@
+/**
+ * Per-agent tool policy for harness/* subagents (defense in depth with frontmatter).
+ */
+
+import {
+	evaluateSubagentToolCall,
+	type ToolCallDecision,
+} from "./spawn-policy.js";
+
+export type HarnessAgentKind =
+	| "planner"
+	| "executor"
+	| "evaluator"
+	| "adversary"
+	| "tie_breaker"
+	| "meta"
+	| "trace"
+	| "incident"
+	| "other";
+
+const MUTATING_TOOLS = new Set(["write", "edit"]);
+
+const BASH_MUTATION_PATTERNS = [
+	/\brm\s+-/i,
+	/\bmv\s+/i,
+	/\bcp\s+/i,
+	/\btouch\s+/i,
+	/\bmkdir\s+/i,
+	/\btee\s+/i,
+	/\bgit\s+(add|commit|push|reset|checkout|merge|rebase|cherry-pick|apply)\b/i,
+	/\bnpm\s+(install|uninstall|ci)\b/i,
+	/\bpnpm\s+(add|install|remove)\b/i,
+	/\byarn\s+(add|install|remove)\b/i,
+	/\bsed\s+-i\b/i,
+	/\bperl\s+-i\b/i,
+];
+
+const READ_ONLY_KINDS = new Set<HarnessAgentKind>([
+	"planner",
+	"evaluator",
+	"adversary",
+	"tie_breaker",
+	"trace",
+	"incident",
+	"meta",
+]);
+
+export function classifyHarnessAgent(agentType: string): HarnessAgentKind {
+	const id = agentType.replace(/^harness\//, "");
+	switch (id) {
+		case "planner":
+			return "planner";
+		case "executor":
+			return "executor";
+		case "evaluator":
+			return "evaluator";
+		case "adversary":
+			return "adversary";
+		case "tie-breaker":
+			return "tie_breaker";
+		case "meta-optimizer":
+			return "meta";
+		case "trace-librarian":
+			return "trace";
+		case "incident-recorder":
+			return "incident";
+		default:
+			return agentType.startsWith("harness/") ? "other" : "other";
+	}
+}
+
+function isMutatingBash(command: string): boolean {
+	return BASH_MUTATION_PATTERNS.some((pattern) => pattern.test(command));
+}
+
+export function isHarnessPackageAgent(agentType: string): boolean {
+	return agentType.startsWith("harness/");
+}
+
+export function evaluateHarnessSubagentToolCall(
+	toolName: string,
+	input: Record<string, unknown> | undefined,
+	agentType: string,
+): ToolCallDecision {
+	const base = evaluateSubagentToolCall(toolName, agentType);
+	if (base.action === "block") {
+		return base;
+	}
+
+	if (!isHarnessPackageAgent(agentType)) {
+		return { action: "allow" };
+	}
+
+	const kind = classifyHarnessAgent(agentType);
+	if (!READ_ONLY_KINDS.has(kind)) {
+		return { action: "allow" };
+	}
+
+	if (MUTATING_TOOLS.has(toolName)) {
+		return {
+			action: "block",
+			reason: `harness-subagent-policy: ${toolName} blocked for harness/${kind} (read-only phase agent).`,
+		};
+	}
+
+	if (toolName === "bash") {
+		const command = String(input?.command ?? "");
+		if (command && isMutatingBash(command)) {
+			return {
+				action: "block",
+				reason: `harness-subagent-policy: mutating bash blocked for harness/${kind}.`,
+			};
+		}
+	}
+
+	return { action: "allow" };
+}
+
+/** Policy phase hint seeded into subagent system prompt appendix when extensions load policy-gate. */
+export function harnessSubagentPhaseHint(agentType: string): string | null {
+	const kind = classifyHarnessAgent(agentType);
+	switch (kind) {
+		case "planner":
+			return "plan";
+		case "executor":
+			return "execute";
+		case "evaluator":
+			return "evaluate";
+		case "adversary":
+			return "adversary";
+		default:
+			return null;
+	}
+}

package/.pi/extensions/lib/harness-subagents/parent-ask-user-bridge.ts

@@ -0,0 +1,89 @@
+/**
+ * Registers ask_user in subagent sessions, delegating UI to the parent harness session.
+ */
+
+import type {
+	ExtensionAPI,
+	ExtensionContext,
+} from "@earendil-works/pi-coding-agent";
+import { runAskDialog } from "../ask-user/dialog.js";
+import { runAskFallback } from "../ask-user/fallback.js";
+import { renderAskCall, renderAskResult } from "../ask-user/render.js";
+import {
+	AskUserParamsSchema,
+	PROMPT_GUIDELINES,
+	PROMPT_SNIPPET,
+} from "../ask-user/schema.js";
+import type { AskUserParams, DialogResult } from "../ask-user/types.js";
+import {
+	formatResultText,
+	toToolDetails,
+	validateAskParams,
+} from "../ask-user/validate.js";
+
+const ASK_USER_AGENT_TYPES = new Set([
+	"harness/planner",
+	"harness/evaluator",
+	"harness/adversary",
+	"harness/tie-breaker",
+]);
+
+export function agentTypeAllowsParentAskUser(agentType: string): boolean {
+	return ASK_USER_AGENT_TYPES.has(agentType);
+}
+
+export function createParentAskUserBridgeFactory(
+	parentCtx: ExtensionContext,
+	agentType: string,
+): ((pi: ExtensionAPI) => void) | null {
+	if (!agentTypeAllowsParentAskUser(agentType)) {
+		return null;
+	}
+	return (pi: ExtensionAPI) => {
+		pi.registerTool({
+			name: "ask_user",
+			label: "Ask User",
+			description:
+				"Ask the user a structured question (parent session UI). Use for clarification and plan approval.",
+			promptSnippet: PROMPT_SNIPPET,
+			promptGuidelines: PROMPT_GUIDELINES,
+			parameters: AskUserParamsSchema,
+			async execute(_toolCallId, params, _signal, _onUpdate) {
+				const validated = validateAskParams(params as AskUserParams);
+				if (typeof validated === "string") {
+					return {
+						content: [{ type: "text", text: validated }],
+						details: {
+							question: params.question ?? "",
+							options: [],
+							response: null,
+							cancelled: true,
+						},
+					};
+				}
+				let outcome: DialogResult;
+				if (parentCtx.hasUI) {
+					outcome = await runAskDialog(parentCtx.ui, validated);
+				} else {
+					outcome = await runAskFallback(parentCtx.ui, validated);
+				}
+				const details = toToolDetails(
+					validated,
+					outcome.response,
+					outcome.cancelled,
+				);
+				const text = formatResultText(outcome.response, outcome.cancelled);
+				return {
+					content: [{ type: "text", text }],
+					details,
+				};
+			},
+			renderCall(args, theme) {
+				return renderAskCall(args, theme);
+			},
+			renderResult(result, options, theme) {
+				return renderAskResult(result, options, theme);
+			},
+		});
+	};
+}

package/.pi/extensions/lib/harness-subagents/spawn-policy.ts

@@ -7,7 +7,13 @@ export const SUBAGENT_BLOCKED_TOOLS = new Set([
 	"get_subagent_result",
 	"steer_subagent",
 	"blackboard",
-	"ask_user",
+]);
+
+const ASK_USER_ALLOWED_AGENT_TYPES = new Set([
+	"harness/planner",
+	"harness/evaluator",
+	"harness/adversary",
+	"harness/tie-breaker",
 ]);
 
 export interface ToolCallDecision {
@@ -16,12 +22,24 @@ export interface ToolCallDecision {
 	newArgs?: Record<string, unknown>;
 }
 
-export function evaluateSubagentToolCall(toolName: string): ToolCallDecision {
+export function evaluateSubagentToolCall(
+	toolName: string,
+	agentType?: string,
+): ToolCallDecision {
 	if (SUBAGENT_BLOCKED_TOOLS.has(toolName)) {
 		return {
 			action: "block",
 			reason: `Tool "${toolName}" is not available in subagent sessions (single spawn depth).`,
 		};
 	}
+	if (toolName === "ask_user") {
+		if (agentType && ASK_USER_ALLOWED_AGENT_TYPES.has(agentType)) {
+			return { action: "allow" };
+		}
+		return {
+			action: "block",
+			reason: `Tool "ask_user" is not available for ${agentType ?? "this agent"} (orchestrator-only).`,
+		};
+	}
 	return { action: "allow" };
 }

package/.pi/extensions/lib/harness-subagents/vendored/agent-manager.ts

@@ -7,12 +7,12 @@
  */
 
 import { randomUUID } from "node:crypto";
-import type { Model } from "@mariozechner/pi-ai";
+import type { Model } from "@earendil-works/pi-ai";
 import type {
 	AgentSession,
 	ExtensionAPI,
 	ExtensionContext,
-} from "@mariozechner/pi-coding-agent";
+} from "@earendil-works/pi-coding-agent";
 import { resumeAgent, runAgent, type ToolActivity } from "./agent-runner.js";
 import type {
 	AgentInvocation,
@@ -252,6 +252,7 @@ export class AgentManager {
 				options.onSessionCreated?.(session);
 			},
 			systemPromptAppendix: options.systemPromptAppendix,
+			parentExtensionContext: ctx,
 		})
 			.then(({ responseText, session, aborted, steered }) => {
 				// Don't overwrite status if externally stopped via abort()

package/.pi/extensions/lib/harness-subagents/vendored/agent-runner.ts

@@ -5,8 +5,8 @@
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import type { Model } from "@mariozechner/pi-ai";
-import type { ExtensionContext } from "@mariozechner/pi-coding-agent";
+import type { Model } from "@earendil-works/pi-ai";
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import {
 	type AgentSession,
 	type AgentSessionEvent,
@@ -16,8 +16,9 @@ import {
 	getAgentDir,
 	SessionManager,
 	SettingsManager,
-} from "@mariozechner/pi-coding-agent";
-import { evaluateSubagentToolCall } from "../spawn-policy.js";
+} from "@earendil-works/pi-coding-agent";
+import { evaluateHarnessSubagentToolCall } from "../harness-subagent-policy.js";
+import { createParentAskUserBridgeFactory } from "../parent-ask-user-bridge.js";
 import {
 	getAgentConfig,
 	getConfig,
@@ -39,7 +40,6 @@ const EXCLUDED_TOOL_NAMES = [
 	"get_subagent_result",
 	"steer_subagent",
 	"blackboard",
-	"ask_user",
 ];
 
 /** Default max turns. undefined = unlimited (no turn limit). */
@@ -152,6 +152,8 @@ export interface RunOptions {
 	}) => void;
 	/** Blackboard or other spawn context appended to the subagent system prompt. */
 	systemPromptAppendix?: string;
+	/** Parent session context — used to bridge ask_user UI into subagents. */
+	parentExtensionContext?: ExtensionContext;
 }
 
 export interface RunResult {
@@ -328,22 +330,31 @@ export async function runAgent(
 			? `${systemPrompt}\n\n---\n\n## Spawn context\n\n${appendix}`
 			: systemPrompt;
 
-	const extensionFactories: Array<(pi: ExtensionAPI) => void> = [
-		(pi) => {
-			pi.on("tool_call", (event) => {
-				const decision = evaluateSubagentToolCall(event.toolName);
-				if (decision.action === "block") {
-					return { block: true, reason: decision.reason };
-				}
-				return undefined;
-			});
-			pi.on("before_agent_start", (event: { systemPrompt?: string }) => {
-				const base =
-					typeof event.systemPrompt === "string" ? event.systemPrompt : "";
-				return { systemPrompt: base };
-			});
-		},
-	];
+	const extensionFactories: Array<(pi: ExtensionAPI) => void> = [];
+	const askUserBridge = options.parentExtensionContext
+		? createParentAskUserBridgeFactory(options.parentExtensionContext, type)
+		: null;
+	if (askUserBridge) {
+		extensionFactories.push(askUserBridge);
+	}
+	extensionFactories.push((pi) => {
+		pi.on("tool_call", (event) => {
+			const decision = evaluateHarnessSubagentToolCall(
+				event.toolName,
+				event.input as Record<string, unknown> | undefined,
+				type,
+			);
+			if (decision.action === "block") {
+				return { block: true, reason: decision.reason };
+			}
+			return undefined;
+		});
+		pi.on("before_agent_start", (event: { systemPrompt?: string }) => {
+			const base =
+				typeof event.systemPrompt === "string" ? event.systemPrompt : "";
+			return { systemPrompt: base };
+		});
+	});
 
 	const loader = new DefaultResourceLoader({
 		cwd: effectiveCwd,
@@ -399,6 +410,7 @@ export async function runAgent(
 	const filterTools = (names: string[]) =>
 		names.filter((t) => {
 			if (EXCLUDED_TOOL_NAMES.includes(t)) return false;
+			if (t === "ask_user" && askUserBridge) return true;
 			if (disallowedSet?.has(t)) return false;
 			if (builtinToolNameSet.has(t)) return true;
 			if (extensions === false) return false;
@@ -412,9 +424,11 @@ export async function runAgent(
 	if (activeTools.length > 0) {
 		session.setActiveToolsByName(activeTools);
 	} else {
-		session.setActiveToolsByName(
-			toolNames.filter((t) => !disallowedSet?.has(t)),
-		);
+		const fallback = toolNames.filter((t) => {
+			if (t === "ask_user" && askUserBridge) return true;
+			return !disallowedSet?.has(t);
+		});
+		session.setActiveToolsByName(fallback);
 	}
 
 	// Bind extensions so that session_start fires and extensions can initialize
@@ -430,6 +444,12 @@ export async function runAgent(
 		},
 	});
 
+	if (askUserBridge) {
+		const withAsk = new Set(session.getActiveToolNames());
+		withAsk.add("ask_user");
+		session.setActiveToolsByName([...withAsk]);
+	}
+
 	options.onSessionCreated?.(session);
 
 	// Track turns for graceful max_turns enforcement

package/.pi/extensions/lib/harness-subagents/vendored/context.ts

@@ -2,7 +2,7 @@
  * context.ts — Extract parent conversation context for subagent inheritance.
  */
 
-import type { ExtensionContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 
 /** Extract text from a message content block array. */
 export function extractText(content: unknown[]): string {

package/.pi/extensions/lib/harness-subagents/vendored/env.ts

@@ -2,7 +2,7 @@
  * env.ts — Detect environment info (git, platform) for subagent system prompts.
  */
 
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { EnvInfo } from "./types.js";
 
 export async function detectEnv(

package/.pi/extensions/lib/harness-subagents/vendored/index.ts

@@ -14,9 +14,13 @@ import {
 	type ExtensionCommandContext,
 	type ExtensionContext,
 	getAgentDir,
-} from "@mariozechner/pi-coding-agent";
-import { Text } from "@mariozechner/pi-tui";
+} from "@earendil-works/pi-coding-agent";
+import { Text } from "@earendil-works/pi-tui";
 import { Type } from "@sinclair/typebox";
+import {
+	extractPlanApprovalsFromEntries,
+	getLatestRunContext,
+} from "../../../lib/harness-run-context.js";
 import { getDriftReport } from "../agent-manifest.js";
 import { Blackboard } from "../blackboard.js";
 import {
@@ -1599,6 +1603,23 @@ Guidelines:
 						cancelNudge(params.agent_id);
 					}
 
+					if (record.session && record.status !== "running") {
+						const parentEntries = _ctx.sessionManager.getEntries();
+						const runCtx = getLatestRunContext(parentEntries);
+						if (runCtx) {
+							const subEntries = record.session.sessionManager.getEntries();
+							for (const approval of extractPlanApprovalsFromEntries(
+								subEntries,
+							)) {
+								pi.appendEntry("harness-plan-approval", {
+									plan_id: approval.plan_id ?? runCtx.plan_id,
+									approved_at: approval.approved_at,
+									source: "ask_user",
+								});
+							}
+						}
+					}
+
 					// Verbose: include full conversation
 					if (params.verbose && record.session) {
 						const conversation = getAgentConversation(record.session);

package/.pi/extensions/lib/harness-subagents/vendored/output-file.ts

@@ -11,7 +11,7 @@ import { join } from "node:path";
 import type {
 	AgentSession,
 	AgentSessionEvent,
-} from "@mariozechner/pi-coding-agent";
+} from "@earendil-works/pi-coding-agent";
 
 /**
  * Encode a cwd path as a filesystem-safe directory name. Handles:

package/.pi/extensions/lib/harness-subagents/vendored/schedule.ts

@@ -18,7 +18,7 @@
 import type {
 	ExtensionAPI,
 	ExtensionContext,
-} from "@mariozechner/pi-coding-agent";
+} from "@earendil-works/pi-coding-agent";
 import { Cron } from "croner";
 import { nanoid } from "nanoid";
 import type { AgentManager } from "./agent-manager.js";

package/.pi/extensions/lib/harness-subagents/vendored/settings.ts

@@ -4,7 +4,7 @@
 
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
-import { getAgentDir } from "@mariozechner/pi-coding-agent";
+import { getAgentDir } from "@earendil-works/pi-coding-agent";
 import type { JoinMode } from "./types.js";
 
 export interface SubagentsSettings {

package/.pi/extensions/lib/harness-subagents/vendored/skill-loader.ts

@@ -22,7 +22,7 @@ import type { Dirent } from "node:fs";
 import { existsSync, readdirSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
-import { getAgentDir } from "@mariozechner/pi-coding-agent";
+import { getAgentDir } from "@earendil-works/pi-coding-agent";
 import { isSymlink, isUnsafeName, safeReadFile } from "./memory.js";
 
 export interface PreloadedSkill {

package/.pi/extensions/lib/harness-subagents/vendored/types.ts

@@ -2,8 +2,8 @@
  * types.ts — Type definitions for the subagent system.
  */
 
-import type { ThinkingLevel } from "@mariozechner/pi-agent-core";
-import type { AgentSession } from "@mariozechner/pi-coding-agent";
+import type { ThinkingLevel } from "@earendil-works/pi-agent-core";
+import type { AgentSession } from "@earendil-works/pi-coding-agent";
 import type { LifetimeUsage } from "./usage.js";
 
 export type { ThinkingLevel };

package/.pi/extensions/lib/harness-subagents/vendored/ui/agent-widget.ts

@@ -5,7 +5,7 @@
  * Uses the callback form of setWidget for themed rendering.
  */
 
-import { truncateToWidth } from "@mariozechner/pi-tui";
+import { truncateToWidth } from "@earendil-works/pi-tui";
 import type { AgentManager } from "../agent-manager.js";
 import { getConfig } from "../agent-types.js";
 import type { AgentInvocation, SubagentType } from "../types.js";

package/.pi/extensions/lib/harness-subagents/vendored/ui/conversation-viewer.ts

@@ -5,7 +5,7 @@
  * Subscribes to session events for real-time streaming updates.
  */
 
-import type { AgentSession } from "@mariozechner/pi-coding-agent";
+import type { AgentSession } from "@earendil-works/pi-coding-agent";
 import {
 	type Component,
 	matchesKey,
@@ -13,7 +13,7 @@ import {
 	truncateToWidth,
 	visibleWidth,
 	wrapTextWithAnsi,
-} from "@mariozechner/pi-tui";
+} from "@earendil-works/pi-tui";
 import { extractText } from "../context.js";
 import type { AgentRecord } from "../types.js";
 import { getLifetimeTotal, getSessionContextPercent } from "../usage.js";

package/.pi/extensions/lib/harness-subagents/vendored/ui/schedule-menu.ts

@@ -8,7 +8,7 @@
  * if real demand emerges.
  */
 
-import type { ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import type { SubagentScheduler } from "../schedule.js";
 import type { ScheduledSubagent } from "../types.js";
 

package/.pi/extensions/observation-bus.ts

@@ -6,7 +6,7 @@
  */
 
 import { randomUUID } from "node:crypto";
-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";

package/.pi/extensions/pi-model-router-harness.ts

@@ -6,7 +6,7 @@
 
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import vendorModelRouter from "../../vendor/pi-model-router/extensions/index.js";
 
 function isHarnessRouterReady(cwd: string): boolean {