ultimate-pi 0.6.1 → 0.7.0

package/.agents/skills/harness-plan/SKILL.md

@@ -10,22 +10,26 @@ description: Produce PlanPacket-aligned harness plans before execute phase. Use
 - User invokes `/harness-plan` or harness-auto planning phase
 - Policy gate blocks mutate tools without approved plan
 - Drift monitor requests replan (`harness-drift-replan`)
+- User replies with clarification after `needs_clarification` (extension injects amend context)
 
 ## Workflow
 
 1. Read `.pi/harness/specs/plan-packet.schema.json`.
-2. When scope, risk, or acceptance is ambiguous, call `ask_user` (see harness-decisions skill) before finalizing the packet.
-3. Capture scope, risks, acceptance criteria, and explicit `plan_id`.
-4. Persist plan reference in prompt (`plan_id=...`) so policy-gate sets `approvedPlan`.
-5. Do not mutate production files in plan phase unless user explicitly requests draft-only outputs.
+2. If `[HarnessActivePlan]` is present, read the current packet from `plan_packet_path` and revise — do not start greenfield unless `/harness-new-run`.
+3. When scope, risk, or acceptance is ambiguous, call `ask_user` (see harness-decisions skill) before finalizing the packet.
+4. Capture scope, risks, acceptance criteria, and explicit `plan_id` in the PlanPacket body.
+5. **Write** JSON to the canonical path from `[HarnessRunContext]` / `[HarnessActivePlan]` before completing.
+6. Do not mutate production files in plan phase unless user explicitly requests draft-only outputs.
+7. Extension sets `approvedPlan` / policy `planId` after disk validation — do **not** use `plan_id=...` prompt hacks.
 
 ## Output
 
 Structured plan summary with:
 
-- `plan_id` (stable string)
+- `plan_id` (stable string in the written file)
 - Phases to run: plan → execute → evaluate → (adversary if needed) → merge
 - Budget hints from env caps (`HARNESS_BUDGET_*`)
+- `next_command`: `/harness-run` when ready
 
 ## Rules
 

package/.agents/skills/harness-sentrux-setup/SKILL.md

@@ -7,7 +7,7 @@ description: Bootstrap Sentrux architectural rules for harness projects — seed
 
 ## When to use
 
-- `/harness-setup` Step 4.4 (Sentrux rules bootstrap)
+- `/harness-setup` Step 4.2 (Sentrux rules bootstrap)
 - Target repo has no `.sentrux/rules.toml` or `harness-verify` reports rules out of date
 - User edited `.pi/harness/sentrux/architecture.manifest.json` (layers, boundaries, constraints)
 
@@ -40,9 +40,8 @@ Custom TOML **outside** `# --- harness:managed:start/end ---` is preserved on ev
    node "$UP_PKG/.pi/scripts/harness-sentrux-bootstrap.mjs"
    ```
 3. Optional: `sentrux plugin add-standard` (language plugins; harness-setup Step 2.8).
-4. Symlink **sentrux** skill into `.pi/skills/` if missing (see harness-setup Step 4.2).
-5. `sentrux check .` — fix violations or tune manifest `max_cc` / layers.
-6. Commit `.sentrux/rules.toml` and project-specific `architecture.manifest.json`.
+4. `sentrux check .` — fix violations or tune manifest `max_cc` / layers.
+5. Commit `.sentrux/rules.toml` and project-specific `architecture.manifest.json`.
 
 ## External repos
 

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

@@ -0,0 +1,194 @@
+/**
+ * System prompt for ultimate-pi end users:
+ * 1. Workspace override: `cwd/.pi/system.md` (lowercase)
+ * 2. Package default: `<ultimate-pi>/.pi/SYSTEM.md` (via package root resolution)
+ *
+ * Does not copy or seed workspace files. Uses `before_agent_start` →
+ * `systemPrompt` replacement (runs early via `00-` prefix so harness extensions
+ * can still append).
+ */
+
+import { existsSync, readFileSync, statSync } from "node:fs";
+import { join } from "node:path";
+import type {
+	BuildSystemPromptOptions,
+	ExtensionAPI,
+} from "@mariozechner/pi-coding-agent";
+import { formatSkillsForPrompt } from "@mariozechner/pi-coding-agent";
+import { resolveHarnessAsset } from "./lib/harness-paths.js";
+
+// @ts-expect-error pi extensions run as ESM
+const MODULE_URL = import.meta.url;
+
+/** Workspace override path (lowercase only — not Pi's SYSTEM.md discovery). */
+const WORKSPACE_SYSTEM_MD = join(".pi", "system.md");
+
+/** Mirror Pi `buildSystemPrompt` customPrompt branch (see system-prompt.js). */
+function buildFromCustomPrompt(
+	customPrompt: string,
+	options: BuildSystemPromptOptions,
+): string {
+	const {
+		appendSystemPrompt,
+		cwd,
+		contextFiles: providedContextFiles,
+		skills: providedSkills,
+		selectedTools,
+	} = options;
+	const promptCwd = cwd.replace(/\\/g, "/");
+	const now = new Date();
+	const year = now.getFullYear();
+	const month = String(now.getMonth() + 1).padStart(2, "0");
+	const day = String(now.getDate()).padStart(2, "0");
+	const date = `${year}-${month}-${day}`;
+	const appendSection = appendSystemPrompt ? `\n\n${appendSystemPrompt}` : "";
+	const contextFiles = providedContextFiles ?? [];
+	const skills = providedSkills ?? [];
+	let prompt = customPrompt;
+	if (appendSection) {
+		prompt += appendSection;
+	}
+	if (contextFiles.length > 0) {
+		prompt += "\n\n# Project Context\n\n";
+		prompt += "Project-specific instructions and guidelines:\n\n";
+		for (const { path: filePath, content } of contextFiles) {
+			prompt += `## ${filePath}\n\n${content}\n\n`;
+		}
+	}
+	const customPromptHasRead = !selectedTools || selectedTools.includes("read");
+	if (customPromptHasRead && skills.length > 0) {
+		prompt += formatSkillsForPrompt(skills);
+	}
+	prompt += `\nCurrent date: ${date}`;
+	prompt += `\nCurrent working directory: ${promptCwd}`;
+	return prompt;
+}
+
+function isDisabled(): boolean {
+	const raw = process.env.ULTIMATE_PI_SYSTEM_PROMPT?.trim().toLowerCase();
+	return raw === "0" || raw === "false" || raw === "off" || raw === "no";
+}
+
+function workspaceSystemPromptPath(cwd: string): string {
+	return join(cwd, WORKSPACE_SYSTEM_MD);
+}
+
+function packageSystemPromptPath(): string {
+	return resolveHarnessAsset(MODULE_URL, ".pi", "SYSTEM.md");
+}
+
+type PromptSource = "workspace" | "package";
+
+function resolveSystemPromptPath(cwd: string): {
+	path: string;
+	source: PromptSource;
+} | null {
+	const workspacePath = workspaceSystemPromptPath(cwd);
+	if (existsSync(workspacePath)) {
+		return { path: workspacePath, source: "workspace" };
+	}
+	const packagePath = packageSystemPromptPath();
+	if (existsSync(packagePath)) {
+		return { path: packagePath, source: "package" };
+	}
+	return null;
+}
+
+interface PromptCache {
+	path: string;
+	source: PromptSource;
+	mtimeMs: number;
+	content: string;
+}
+
+function readPromptFile(path: string): string | null {
+	try {
+		const content = readFileSync(path, "utf-8").trim();
+		return content.length > 0 ? content : null;
+	} catch {
+		return null;
+	}
+}
+
+export default function ultimatePiSystemPrompt(pi: ExtensionAPI) {
+	if (isDisabled()) {
+		return;
+	}
+
+	let cache: PromptCache | null = null;
+	let warnedMissing = false;
+
+	const loadSystemPrompt = (
+		cwd: string,
+	): { content: string; path: string; source: PromptSource } | null => {
+		const resolved = resolveSystemPromptPath(cwd);
+		if (!resolved) {
+			return null;
+		}
+		try {
+			const { mtimeMs } = statSync(resolved.path);
+			if (
+				cache &&
+				cache.path === resolved.path &&
+				cache.source === resolved.source &&
+				cache.mtimeMs === mtimeMs
+			) {
+				return {
+					content: cache.content,
+					path: cache.path,
+					source: cache.source,
+				};
+			}
+			const content = readPromptFile(resolved.path);
+			if (!content) {
+				return null;
+			}
+			cache = {
+				path: resolved.path,
+				source: resolved.source,
+				mtimeMs,
+				content,
+			};
+			return { content, path: resolved.path, source: resolved.source };
+		} catch {
+			return null;
+		}
+	};
+
+	const invalidateCache = () => {
+		cache = null;
+		warnedMissing = false;
+	};
+
+	pi.on("session_start", () => {
+		invalidateCache();
+	});
+
+	pi.on("before_agent_start", async (event, ctx) => {
+		const cwd = ctx.cwd ?? process.cwd();
+		const loaded = loadSystemPrompt(cwd);
+
+		if (!loaded) {
+			if (!warnedMissing) {
+				const workspacePath = workspaceSystemPromptPath(cwd);
+				const pkgPath = packageSystemPromptPath();
+				ctx.ui.notify(
+					`[ultimate-pi] No system prompt found.\n` +
+						`  Workspace override: ${workspacePath}\n` +
+						`  Package default: ${pkgPath}\n` +
+						`Using Pi default system prompt.`,
+					"warning",
+				);
+				warnedMissing = true;
+			}
+			return;
+		}
+
+		return {
+			systemPrompt: buildFromCustomPrompt(
+				loaded.content,
+				event.systemPromptOptions,
+			),
+		};
+	});
+}

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

@@ -8,6 +8,7 @@
 import { appendFile, mkdir, readFile } from "node:fs/promises";
 import { join } from "node:path";
 import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import { getRunIdFromSession } from "../lib/harness-run-context.js";
 
 type HarnessPhase = "plan" | "execute" | "evaluate" | "adversary" | "merge";
 
@@ -129,8 +130,15 @@ function getPolicyContext(ctx: {
 	return { phase: null, budgetBypass: false };
 }
 
-function getRunId(ctx: { sessionManager: { getSessionId(): string } }): string {
-	return ctx.sessionManager.getSessionId();
+function getRunId(ctx: {
+	sessionManager: { getEntries(): unknown[]; getSessionId(): string };
+}): string {
+	return (
+		getRunIdFromSession(
+			ctx.sessionManager.getEntries(),
+			ctx.sessionManager.getSessionId(),
+		) ?? ctx.sessionManager.getSessionId()
+	);
 }
 
 async function readDebateCapsFromSchema(): Promise<{

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

@@ -17,6 +17,7 @@
 import { appendFile, mkdir, readFile, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import { getRunIdFromSession } from "../lib/harness-run-context.js";
 
 type DebateParticipant =
 	| "EvaluatorAgent"
@@ -92,8 +93,15 @@ async function ensureDebatesDir(): Promise<void> {
 	await mkdir(DEBATES_DIR, { recursive: true });
 }
 
-function getRunId(ctx: { sessionManager: { getSessionId(): string } }): string {
-	return ctx.sessionManager.getSessionId();
+function getRunId(ctx: {
+	sessionManager: { getEntries(): unknown[]; getSessionId(): string };
+}): string {
+	return (
+		getRunIdFromSession(
+			ctx.sessionManager.getEntries(),
+			ctx.sessionManager.getSessionId(),
+		) ?? ctx.sessionManager.getSessionId()
+	);
 }
 
 async function readRoundCapsFromSchema(): Promise<{

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

@@ -285,9 +285,16 @@ class HarnessWidgetComponent {
 		const toolDisplay = this.inFlight.lastToolName
 			? `${this.inFlight.toolCount}:${this.inFlight.lastToolName}`
 			: String(this.inFlight.toolCount);
-		const traceDisplay = this.state.traceRunId ?? "n/a";
+		const nextDisplay =
+			this.state.nextRecommendedCommand != null
+				? this.state.nextRecommendedCommand.length > 36
+					? `${this.state.nextRecommendedCommand.slice(0, 33)}...`
+					: this.state.nextRecommendedCommand
+				: null;
 		const row3Left = `${planFlag} ${reviewFlag} ${budgetFlag} ${testsFlag}`;
-		const row3Right = `${theme.fg("dim", "inFlight:")}${theme.fg("accent", toolDisplay)} ${theme.fg("dim", "trace:")}${theme.fg("muted", traceDisplay)}`;
+		const row3Right = nextDisplay
+			? `${theme.fg("dim", "inFlight:")}${theme.fg("accent", toolDisplay)} ${theme.fg("dim", "next:")}${theme.fg("accent", nextDisplay)}`
+			: `${theme.fg("dim", "inFlight:")}${theme.fg("accent", toolDisplay)}`;
 		const row3 = composeZones(row3Left, row3Right, rowWidth);
 
 		const lines: string[] = [truncateToWidth(row1, rowWidth)];
@@ -353,7 +360,7 @@ export default function harnessLiveWidget(pi: ExtensionAPI) {
 			policyDecision: state.policyDecision,
 			consensusDelta: state.consensusDelta,
 			severity: state.severity,
-			traceRunId: state.traceRunId,
+			nextRecommendedCommand: state.nextRecommendedCommand,
 			inFlight,
 		});
 	}