@phi-code-admin/phi-code 0.81.0 → 0.82.1

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## [0.82.1] - 2026-06-14
+
+### Fixed
+
+- **EXPLORE fan-out, validated against a real run.** Two parallel read-only
+  sub-explorers ran end-to-end against the live proxy in ~17s with no rate limit
+  and produced correct, merged findings. The validation surfaced one cleanup: the
+  model's `<think>` / `<thinking>` reasoning blocks leaked into the merged brief,
+  so they are now stripped before merging.
+
+## [0.82.0] - 2026-06-14
+
+### Added
+
+- **Opt-in parallel EXPLORE fan-out** (`/plan --fanout <description>`). Before
+  phase 1, the orchestrator runs up to **2 concurrent read-only** sub-explorers,
+  each with a narrow mandate (architecture & reusable patterns, impacted files,
+  risks & constraints), and merges their findings into the EXPLORE context. This
+  applies the perspective-diverse pattern to the front of the pipeline so the
+  downstream phases start from a fuller, more accurate map.
+
+  Guardrails (the fan-out is best-effort and never breaks a run): default OFF
+  (single-agent EXPLORE unchanged); read-only tool set only (no write/edit/bash);
+  hard concurrency cap of 2 against the single rate-limited key; **adaptive
+  fallback to sequential** the moment a sub-explorer reports a 429 / rate limit;
+  a per-explorer timeout that kills the process; and full graceful degradation to
+  the normal EXPLORE on any error, empty result, or rate limit. Experimental: not
+  yet validated against a live proxy at scale, hence opt-in.
+
 ## [0.81.0] - 2026-06-14
 
 Marathon increment 4 (prompt-only, low risk).

package/extensions/phi/orchestrator.ts

@@ -28,6 +28,7 @@ import {
 	isTransientError,
 	parsePhaseVerdict,
 } from "./providers/orchestrator-helpers.js";
+import { defaultExplorerSpecs, READONLY_EXPLORER_TOOLS, runExploreFanout } from "./providers/explore-fanout.js";
 
 // ─── Types ───────────────────────────────────────────────────────────────
 
@@ -1137,10 +1138,13 @@ Tag the note with relevant keywords for vector search.
 				return;
 			}
 
-			const description = rawArgs;
+			// Opt-in: `--fanout` runs a small read-only parallel exploration before
+			// phase 1 (default OFF — single-agent EXPLORE, the safe behaviour).
+			const wantFanout = /(^|\s)--fanout\b/.test(rawArgs);
+			const description = rawArgs.replace(/(^|\s)--fanout\b/g, " ").trim();
 
 			if (!description) {
-				ctx.ui.notify(`**Usage:** \`/plan <project description>\` (or \`/plan --resume\` to continue a checkpointed run)
+				ctx.ui.notify(`**Usage:** \`/plan <project description>\` (or \`/plan --resume\` to continue a checkpointed run, \`/plan --fanout <desc>\` for parallel exploration)
 
 **Examples:**
   /plan Build a REST API for user authentication with JWT
@@ -1188,6 +1192,35 @@ Tag the note with relevant keywords for vector search.
 
 			// Record orchestration start time for final summary
 			phaseStartTime = Date.now();
+
+			// Opt-in parallel EXPLORE fan-out (read-only, <=2 concurrent, sequential
+			// fallback on rate limit). Best-effort: any failure degrades to the normal
+			// single-agent EXPLORE below by simply not enriching the instruction.
+			if (wantFanout) {
+				try {
+					const available = ctx.modelRegistry?.getAvailable?.() || [];
+					const exploreModelId = resolveModelRef(available, firstPhase.model)?.id || firstPhase.model;
+					ctx.ui.notify(`\n🔭 **Parallel exploration** (read-only, up to 2 concurrent) — building a fuller map before phase 1...`, "info");
+					const fan = await runExploreFanout(defaultExplorerSpecs(description), {
+						model: exploreModelId,
+						tools: READONLY_EXPLORER_TOOLS,
+						cwd: ctx.cwd || process.cwd(),
+						concurrency: 2,
+						timeoutMs: 4 * 60 * 1000,
+					});
+					const okCount = fan.results.filter((r) => r.ok).length;
+					if (fan.merged.trim()) {
+						firstPhase.instruction =
+							`## Parallel exploration findings (${okCount} read-only sub-explorer(s))\nUse these as a starting map; verify and synthesize them into your brief, do not trust them blindly.\n\n${fan.merged}\n\n---\n${firstPhase.instruction}`;
+						ctx.ui.notify(`\n🔭 ${okCount} sub-exploration(s) merged into EXPLORE${fan.rateLimited ? " (rate limit hit — ran the rest sequentially)" : ""}.`, "info");
+					} else {
+						ctx.ui.notify(`\n🔭 Parallel exploration returned nothing usable${fan.rateLimited ? " (rate-limited)" : ""} — running the normal single-agent EXPLORE.`, "warning");
+					}
+				} catch {
+					ctx.ui.notify(`\n🔭 Parallel exploration skipped (error) — running the normal single-agent EXPLORE.`, "warning");
+				}
+			}
+
 			// Switch model and activate agent for first phase
 			const { modelId, warning } = await switchModelForPhase(firstPhase, ctx);
 			activateAgent(firstPhase, ctx);

package/extensions/phi/providers/explore-fanout.ts

@@ -0,0 +1,211 @@
+/**
+ * Opt-in parallel EXPLORE fan-out for the /plan orchestrator.
+ *
+ * Spawns a small number of read-only `pi` sub-explorers, each with a narrow focus
+ * (architecture / impacted files / risks), and merges their findings into the
+ * EXPLORE phase context. This is the perspective-diverse pattern applied to the
+ * front of the pipeline: a more complete map of the codebase means better
+ * downstream plan/code/test phases.
+ *
+ * GUARDRAILS (this whole module is best-effort and NEVER throws):
+ *  - Read-only only: sub-explorers get a read-only tool set, no write/edit/bash.
+ *  - Hard concurrency cap of 2 (a single rate-limited proxy key is the constraint).
+ *  - Adaptive fallback: if any sub-explorer reports a 429 / rate limit, the
+ *    remaining ones run sequentially (concurrency drops to 1).
+ *  - Per-explorer timeout, with the process killed on expiry.
+ *  - Any failure (spawn error, timeout, no output, rate limit) degrades to "no
+ *    findings" so the orchestrator simply runs the normal single-agent EXPLORE.
+ */
+
+import { spawn } from "node:child_process";
+import { existsSync } from "node:fs";
+import { basename } from "node:path";
+
+export interface ExplorerSpec {
+	focus: string;
+	prompt: string;
+}
+
+export interface ExplorerResult {
+	focus: string;
+	text: string;
+	ok: boolean;
+	rateLimited: boolean;
+	error?: string;
+}
+
+export interface FanoutOptions {
+	model?: string;
+	tools?: string[];
+	cwd?: string;
+	concurrency?: number;
+	timeoutMs?: number;
+}
+
+/** Read-only tools handed to every sub-explorer. */
+export const READONLY_EXPLORER_TOOLS = ["read", "grep", "glob", "ls", "find", "memory_search", "memory_read"];
+
+const HARD_CONCURRENCY_CAP = 2;
+const DEFAULT_TIMEOUT_MS = 4 * 60 * 1000;
+
+/** Re-invoke the current phi binary (so the sub-explorer is the same build). */
+function getPiInvocation(args: string[]): { command: string; args: string[] } {
+	const currentScript = process.argv[1];
+	const isBunVirtualScript = currentScript?.startsWith("/$bunfs/root/");
+	if (currentScript && !isBunVirtualScript && existsSync(currentScript)) {
+		return { command: process.execPath, args: [currentScript, ...args] };
+	}
+	const execName = basename(process.execPath).toLowerCase();
+	const isGenericRuntime = /^(node|bun)(\.exe)?$/.test(execName);
+	if (!isGenericRuntime) return { command: process.execPath, args };
+	return { command: "pi", args };
+}
+
+export function isRateLimited(text: string): boolean {
+	return /\b429\b|rate.?limit(ed)?|too many requests|overloaded|quota exceeded|resource exhausted/i.test(text);
+}
+
+/** Strip the model's reasoning blocks so they do not pollute the merged brief. */
+export function stripThinking(text: string): string {
+	return text
+		.replace(/<think>[\s\S]*?<\/think>/gi, "")
+		.replace(/<thinking>[\s\S]*?<\/thinking>/gi, "")
+		.replace(/\n{3,}/g, "\n\n")
+		.trim();
+}
+
+/** Run one sub-explorer. Never throws; always resolves to an ExplorerResult. */
+function runOneExplorer(spec: ExplorerSpec, opts: FanoutOptions): Promise<ExplorerResult> {
+	return new Promise((resolve) => {
+		const args = ["--mode", "json", "-p", "--no-session"];
+		if (opts.model) args.push("--model", opts.model);
+		const tools = opts.tools && opts.tools.length > 0 ? opts.tools : READONLY_EXPLORER_TOOLS;
+		args.push("--tools", tools.join(","));
+		args.push(`Task: ${spec.prompt}`);
+
+		let proc: ReturnType<typeof spawn>;
+		try {
+			const inv = getPiInvocation(args);
+			proc = spawn(inv.command, inv.args, { cwd: opts.cwd, shell: false, stdio: ["ignore", "pipe", "pipe"] });
+		} catch (e) {
+			resolve({ focus: spec.focus, text: "", ok: false, rateLimited: false, error: String(e) });
+			return;
+		}
+
+		let buffer = "";
+		let finalText = "";
+		let stderr = "";
+		let errorMessage = "";
+		let settled = false;
+
+		const timer = setTimeout(() => {
+			try {
+				proc.kill();
+			} catch {
+				/* best effort */
+			}
+		}, opts.timeoutMs ?? DEFAULT_TIMEOUT_MS);
+
+		const processLine = (line: string) => {
+			if (!line.trim()) return;
+			let event: any;
+			try {
+				event = JSON.parse(line);
+			} catch {
+				return;
+			}
+			if (event?.type === "message_end" && event.message?.role === "assistant") {
+				const parts = event.message.content;
+				if (Array.isArray(parts)) {
+					for (const p of parts) {
+						if (p?.type === "text" && typeof p.text === "string") finalText = p.text;
+					}
+				}
+				if (event.message.errorMessage) errorMessage = String(event.message.errorMessage);
+			}
+		};
+
+		const finish = (timedOut: boolean) => {
+			if (settled) return;
+			settled = true;
+			clearTimeout(timer);
+			if (buffer.trim()) processLine(buffer);
+			const blob = `${finalText}\n${errorMessage}\n${stderr}`;
+			const rateLimited = isRateLimited(blob);
+			const ok = !timedOut && finalText.trim().length > 0 && !rateLimited;
+			resolve({
+				focus: spec.focus,
+				text: finalText,
+				ok,
+				rateLimited,
+				error: errorMessage || (ok ? undefined : timedOut ? "timeout" : "no output"),
+			});
+		};
+
+		proc.stdout?.on("data", (data) => {
+			buffer += data.toString();
+			const lines = buffer.split("\n");
+			buffer = lines.pop() || "";
+			for (const line of lines) processLine(line);
+		});
+		proc.stderr?.on("data", (data) => {
+			stderr += data.toString();
+		});
+		proc.on("error", (e) => {
+			if (settled) return;
+			settled = true;
+			clearTimeout(timer);
+			resolve({ focus: spec.focus, text: "", ok: false, rateLimited: false, error: String(e) });
+		});
+		proc.on("close", () => finish(false));
+	});
+}
+
+/**
+ * Run the sub-explorers with a hard concurrency cap of 2; if a batch hits a rate
+ * limit, drop to sequential for the rest. Returns the merged findings (markdown)
+ * plus the raw results. Best-effort: callers should fall back to the normal
+ * single-agent EXPLORE when `merged` is empty.
+ */
+export async function runExploreFanout(
+	specs: ExplorerSpec[],
+	opts: FanoutOptions,
+): Promise<{ results: ExplorerResult[]; merged: string; rateLimited: boolean }> {
+	let concurrency = Math.max(1, Math.min(opts.concurrency ?? HARD_CONCURRENCY_CAP, HARD_CONCURRENCY_CAP));
+	const results: ExplorerResult[] = [];
+	let i = 0;
+	while (i < specs.length) {
+		const batch = specs.slice(i, i + concurrency);
+		const batchResults = await Promise.all(batch.map((s) => runOneExplorer(s, opts)));
+		results.push(...batchResults);
+		i += batch.length;
+		// Adaptive backoff: a rate limit means the single key is saturated, so
+		// serialize whatever is left rather than push harder.
+		if (batchResults.some((r) => r.rateLimited)) concurrency = 1;
+	}
+	const ok = results.filter((r) => r.ok && r.text.trim());
+	const merged = ok
+		.map((r) => `### Exploration — ${r.focus}\n${stripThinking(r.text)}`)
+		.filter((block) => block.trim().length > 0)
+		.join("\n\n");
+	return { results, merged, rateLimited: results.some((r) => r.rateLimited) };
+}
+
+/** The default narrow-mandate explorer specs for a /plan request. */
+export function defaultExplorerSpecs(description: string): ExplorerSpec[] {
+	const base = `Read-only exploration. Do NOT modify any file. Be concise and cite file:line.`;
+	return [
+		{
+			focus: "architecture & reusable patterns",
+			prompt: `${base}\nProject request: ${description}\nExplore the codebase architecture: tech stack, key modules/directories, the conventions and existing utilities/functions to REUSE, and how the pieces fit together.`,
+		},
+		{
+			focus: "impacted files",
+			prompt: `${base}\nProject request: ${description}\nIdentify the files and code that will be IMPACTED: grep the relevant symbols, find callers and callees, and list the exact files (file:line) that will likely need changes and why.`,
+		},
+		{
+			focus: "risks & constraints",
+			prompt: `${base}\nProject request: ${description}\nIdentify risks, edge cases, and constraints to NOT break: behaviour that must be preserved, error handling, security, and tests that cover the area.`,
+		},
+	];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@phi-code-admin/phi-code",
-	"version": "0.81.0",
+	"version": "0.82.1",
 	"description": "Coding agent CLI with persistent memory, sub-agents, intelligent routing, and orchestration",
 	"type": "module",
 	"piConfig": {