pi-improve-interation 0.0.1

package/node_modules/pi-subagents/src/intercom/native-supervisor-channel.ts

@@ -0,0 +1,812 @@
+import { randomUUID } from "node:crypto";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import type { AgentToolResult } from "@earendil-works/pi-agent-core";
+import type { ExtensionAPI, ExtensionContext, ToolDefinition } from "@earendil-works/pi-coding-agent";
+import { Type } from "typebox";
+import {
+	SUBAGENT_CHILD_AGENT_ENV,
+	SUBAGENT_CHILD_INDEX_ENV,
+	SUBAGENT_ORCHESTRATOR_SESSION_ID_ENV,
+	SUBAGENT_ORCHESTRATOR_TARGET_ENV,
+	SUBAGENT_RUN_ID_ENV,
+	SUBAGENT_SUPERVISOR_CHANNEL_DIR_ENV,
+} from "../runs/shared/pi-args.ts";
+import { INTERCOM_DETACH_REQUEST_EVENT, POLL_INTERVAL_MS, TEMP_ROOT_DIR, type IntercomEventBus, type SubagentState } from "../shared/types.ts";
+import { writeAtomicJson } from "../shared/atomic-json.ts";
+import { shouldUseNativeFsWatch } from "../shared/watch-strategy.ts";
+
+const SUPERVISOR_CHANNEL_ROOT = path.join(TEMP_ROOT_DIR, "supervisor-channels");
+const REQUESTS_DIR = "requests";
+const REPLIES_DIR = "replies";
+export const NATIVE_SUPERVISOR_TOOL_NAME = "subagent_supervisor";
+const MAX_MESSAGE_BYTES = 64 * 1024;
+const DEFAULT_ASK_TIMEOUT_MS = 10 * 60 * 1000;
+const CHANNEL_POLL_MS = Math.min(POLL_INTERVAL_MS, 500);
+const CHANNEL_SAFETY_POLL_MS = 5000;
+const STALE_EMPTY_CHANNEL_AGE_MS = 60 * 1000;
+const STALE_EMPTY_CHANNEL_CLEANUP_INTERVAL_MS = 60 * 1000;
+
+type SupervisorReason = "need_decision" | "interview_request" | "progress_update";
+
+interface SupervisorRequest {
+	type: "subagent.supervisor.request";
+	id: string;
+	createdAt: number;
+	expiresAt?: number;
+	reason: SupervisorReason;
+	message: string;
+	expectsReply: boolean;
+	orchestratorTarget?: string;
+	orchestratorSessionId?: string;
+	runId: string;
+	agent: string;
+	childIndex: number;
+	childTarget?: string;
+	interview?: unknown;
+}
+
+interface PendingSupervisorRequest extends SupervisorRequest {
+	channelDir: string;
+	requestFile: string;
+}
+
+interface SupervisorReply {
+	type: "subagent.supervisor.reply";
+	requestId: string;
+	createdAt: number;
+	message: string;
+}
+
+interface ContactSupervisorParams {
+	reason: SupervisorReason;
+	message?: string;
+	interview?: unknown;
+}
+
+interface IntercomParams {
+	action: "list" | "send" | "ask" | "reply" | "pending" | "status";
+	to?: string;
+	message?: string;
+	replyTo?: string;
+}
+
+type SupervisorWatch = (filename: fs.PathLike, listener: fs.WatchListener<string>) => fs.FSWatcher;
+
+interface NativeSupervisorChannelDeps {
+	platform?: NodeJS.Platform;
+	watch?: SupervisorWatch;
+	timers?: Pick<typeof globalThis, "setInterval" | "clearInterval" | "setImmediate" | "clearImmediate">;
+}
+
+const ContactSupervisorParamsSchema = Type.Object({
+	reason: Type.String({ enum: ["need_decision", "interview_request", "progress_update"] }),
+	message: Type.Optional(Type.String()),
+	interview: Type.Optional(Type.Unsafe({ type: "object", additionalProperties: true })),
+}, { additionalProperties: false });
+
+const IntercomParamsSchema = Type.Object({
+	action: Type.String({ enum: ["list", "send", "ask", "reply", "pending", "status"] }),
+	to: Type.Optional(Type.String()),
+	message: Type.Optional(Type.String()),
+	replyTo: Type.Optional(Type.String()),
+}, { additionalProperties: false });
+
+function safeSegment(value: string): string {
+	return value.trim().replace(/[^A-Za-z0-9._-]+/g, "-").replace(/^-+|-+$/g, "") || "unknown";
+}
+
+export function resolveSupervisorChannelDir(runId: string, agent: string, childIndex: number): string {
+	return path.join(SUPERVISOR_CHANNEL_ROOT, `${safeSegment(runId)}-${safeSegment(agent)}-${childIndex}`);
+}
+
+export function ensureSupervisorChannelDir(channelDir: string): void {
+	fs.mkdirSync(path.join(channelDir, REQUESTS_DIR), { recursive: true, mode: 0o700 });
+	fs.mkdirSync(path.join(channelDir, REPLIES_DIR), { recursive: true, mode: 0o700 });
+}
+
+function requestPath(channelDir: string, requestId: string): string {
+	return path.join(channelDir, REQUESTS_DIR, `${safeSegment(requestId)}.json`);
+}
+
+function replyPath(channelDir: string, requestId: string): string {
+	return path.join(channelDir, REPLIES_DIR, `${safeSegment(requestId)}.json`);
+}
+
+function readTextEnv(name: string): string | undefined {
+	const value = process.env[name]?.trim();
+	return value ? value : undefined;
+}
+
+function readChildMetadata(): {
+	channelDir: string;
+	runId: string;
+	agent: string;
+	childIndex: number;
+	orchestratorTarget?: string;
+	orchestratorSessionId?: string;
+	childTarget?: string;
+} | undefined {
+	const channelDir = readTextEnv(SUBAGENT_SUPERVISOR_CHANNEL_DIR_ENV);
+	const runId = readTextEnv(SUBAGENT_RUN_ID_ENV);
+	const agent = readTextEnv(SUBAGENT_CHILD_AGENT_ENV);
+	const rawIndex = readTextEnv(SUBAGENT_CHILD_INDEX_ENV);
+	const orchestratorSessionId = readTextEnv(SUBAGENT_ORCHESTRATOR_SESSION_ID_ENV);
+	if (!channelDir || !runId || !agent || !orchestratorSessionId || rawIndex === undefined || !/^\d+$/.test(rawIndex)) return undefined;
+	return {
+		channelDir,
+		runId,
+		agent,
+		childIndex: Number(rawIndex),
+		orchestratorTarget: readTextEnv(SUBAGENT_ORCHESTRATOR_TARGET_ENV),
+		orchestratorSessionId,
+		childTarget: readTextEnv("PI_SUBAGENT_INTERCOM_SESSION_NAME"),
+	};
+}
+
+function reasonHeading(reason: SupervisorReason): string {
+	if (reason === "interview_request") return "Subagent requests a structured supervisor interview.";
+	if (reason === "progress_update") return "Subagent progress update.";
+	return "Subagent needs a supervisor decision.";
+}
+
+function formatChildMessage(input: {
+	reason: SupervisorReason;
+	message?: string;
+	interview?: unknown;
+	runId: string;
+	agent: string;
+	childIndex: number;
+	childTarget?: string;
+}): string {
+	const lines = [
+		reasonHeading(input.reason),
+		`Run: ${input.runId}`,
+		`Agent: ${input.agent}`,
+		`Child index: ${input.childIndex}`,
+	];
+	if (input.childTarget) lines.push(`Child intercom target: ${input.childTarget}`);
+	lines.push("");
+	if (input.message?.trim()) lines.push(input.message.trim());
+	if (input.reason === "interview_request") {
+		lines.push(
+			"",
+			"Structured response requested. Reply with JSON, optionally fenced in ```json, matching the requested interview shape.",
+		);
+		if (input.interview !== undefined) lines.push(JSON.stringify(input.interview, null, "\t"));
+	}
+	return lines.join("\n").trimEnd();
+}
+
+function parseStructuredReply(message: string): { value?: unknown; error?: string } {
+	const trimmed = message.trim();
+	const fenced = trimmed.match(/^```(?:json)?\s*([\s\S]*?)\s*```$/i)?.[1]?.trim();
+	try {
+		return { value: JSON.parse(fenced ?? trimmed) };
+	} catch (error) {
+		return { error: error instanceof Error ? `${error.name}: ${error.message}` : String(error) };
+	}
+}
+
+function askTimeoutMs(): number {
+	const parsed = Number(process.env.PI_INTERCOM_ASK_TIMEOUT_MS);
+	return Number.isFinite(parsed) && parsed > 0 ? parsed : DEFAULT_ASK_TIMEOUT_MS;
+}
+
+function delay(ms: number, signal?: AbortSignal): Promise<void> {
+	return new Promise((resolve, reject) => {
+		if (signal?.aborted) {
+			reject(new Error("Supervisor request cancelled."));
+			return;
+		}
+		let timer: ReturnType<typeof setTimeout> | undefined;
+		const cleanup = () => {
+			if (timer) clearTimeout(timer);
+			signal?.removeEventListener("abort", onAbort);
+		};
+		const onAbort = () => {
+			cleanup();
+			reject(new Error("Supervisor request cancelled."));
+		};
+		timer = setTimeout(() => {
+			cleanup();
+			resolve();
+		}, ms);
+		signal?.addEventListener("abort", onAbort, { once: true });
+	});
+}
+
+async function waitForReply(channelDir: string, requestId: string, deadline: number, signal?: AbortSignal): Promise<SupervisorReply> {
+	const file = replyPath(channelDir, requestId);
+	while (Date.now() <= deadline) {
+		if (signal?.aborted) throw new Error("Supervisor request cancelled.");
+		if (fs.existsSync(file)) {
+			const parsed = JSON.parse(fs.readFileSync(file, "utf-8")) as Partial<SupervisorReply>;
+			if (parsed.type === "subagent.supervisor.reply" && parsed.requestId === requestId && typeof parsed.message === "string") {
+				return parsed as SupervisorReply;
+			}
+		}
+		await delay(250, signal);
+	}
+	throw new Error("Timed out waiting for supervisor reply.");
+}
+
+async function sendSupervisorRequest(params: ContactSupervisorParams, signal?: AbortSignal): Promise<AgentToolResult<Record<string, unknown>>> {
+	const metadata = readChildMetadata();
+	if (!metadata) throw new Error("Native supervisor channel is not available for this subagent.");
+	if (params.reason !== "progress_update" && !params.message?.trim() && params.reason !== "interview_request") {
+		throw new Error("message is required for supervisor decisions.");
+	}
+	ensureSupervisorChannelDir(metadata.channelDir);
+	const requestId = randomUUID();
+	const expectsReply = params.reason !== "progress_update";
+	const createdAt = Date.now();
+	const replyDeadline = createdAt + askTimeoutMs();
+	const expiresAt = expectsReply ? replyDeadline : undefined;
+	const message = formatChildMessage({ ...metadata, reason: params.reason, message: params.message, interview: params.interview });
+	const request: SupervisorRequest = {
+		type: "subagent.supervisor.request",
+		id: requestId,
+		createdAt,
+		...(expiresAt !== undefined ? { expiresAt } : {}),
+		reason: params.reason,
+		message,
+		expectsReply,
+		...(metadata.orchestratorTarget ? { orchestratorTarget: metadata.orchestratorTarget } : {}),
+		...(metadata.orchestratorSessionId ? { orchestratorSessionId: metadata.orchestratorSessionId } : {}),
+		runId: metadata.runId,
+		agent: metadata.agent,
+		childIndex: metadata.childIndex,
+		...(metadata.childTarget ? { childTarget: metadata.childTarget } : {}),
+		...(params.interview !== undefined ? { interview: params.interview } : {}),
+	};
+	const serialized = JSON.stringify(request, null, "\t");
+	if (Buffer.byteLength(serialized, "utf-8") > MAX_MESSAGE_BYTES) throw new Error("Supervisor request is too large.");
+	writeAtomicJson(requestPath(metadata.channelDir, requestId), request);
+
+	if (!expectsReply) {
+		return {
+			content: [{ type: "text", text: "Supervisor progress update queued." }],
+			details: { delivered: true, requestId, reason: params.reason },
+		};
+	}
+
+	try {
+		const reply = await waitForReply(metadata.channelDir, requestId, replyDeadline, signal);
+		const details: Record<string, unknown> = { requestId, reason: params.reason };
+		if (params.reason === "interview_request") {
+			const structured = parseStructuredReply(reply.message);
+			if (structured.error) details.structuredReplyParseError = structured.error;
+			else details.structuredReply = structured.value;
+		}
+		return {
+			content: [{ type: "text", text: `**Reply from supervisor:**\n${reply.message}` }],
+			details,
+		};
+	} catch (error) {
+		removeRequestFile(requestPath(metadata.channelDir, requestId));
+		throw error;
+	}
+}
+
+function hasTool(pi: ExtensionAPI, name: string): boolean {
+	try {
+		return pi.getAllTools?.().some((tool: { name?: unknown }) => tool.name === name) === true;
+	} catch {
+		return false;
+	}
+}
+
+export function registerNativeSupervisorClient(pi: ExtensionAPI): void {
+	if (!readChildMetadata() || hasTool(pi, "contact_supervisor")) return;
+	const tool: ToolDefinition<typeof ContactSupervisorParamsSchema, Record<string, unknown>> = {
+		name: "contact_supervisor",
+		label: "Contact Supervisor",
+		description: "Contact the parent/supervisor session for a blocking decision, structured interview, or progress update.",
+		parameters: ContactSupervisorParamsSchema,
+		execute(_id, params, signal) {
+			return sendSupervisorRequest(params as ContactSupervisorParams, signal);
+		},
+	};
+	pi.registerTool(tool);
+}
+
+function parseRequestFile(file: string, channelDir: string): PendingSupervisorRequest | undefined {
+	try {
+		const parsed = JSON.parse(fs.readFileSync(file, "utf-8")) as Partial<SupervisorRequest>;
+		if (parsed.type !== "subagent.supervisor.request") return undefined;
+		if (typeof parsed.id !== "string" || !parsed.id) return undefined;
+		if (parsed.reason !== "need_decision" && parsed.reason !== "interview_request" && parsed.reason !== "progress_update") return undefined;
+		if (typeof parsed.message !== "string" || !parsed.message) return undefined;
+		if (typeof parsed.runId !== "string" || typeof parsed.agent !== "string" || typeof parsed.childIndex !== "number") return undefined;
+		return { ...parsed as SupervisorRequest, channelDir, requestFile: file };
+	} catch {
+		return undefined;
+	}
+}
+
+function listRequestFiles(): Array<{ channelDir: string; file: string }> {
+	let channelEntries: fs.Dirent[];
+	try {
+		channelEntries = fs.readdirSync(SUPERVISOR_CHANNEL_ROOT, { withFileTypes: true });
+	} catch (error) {
+		if ((error as NodeJS.ErrnoException).code === "ENOENT") return [];
+		throw error;
+	}
+	const files: Array<{ channelDir: string; file: string }> = [];
+	for (const entry of channelEntries) {
+		if (!entry.isDirectory()) continue;
+		const channelDir = path.join(SUPERVISOR_CHANNEL_ROOT, entry.name);
+		const requestsDir = path.join(channelDir, REQUESTS_DIR);
+		let requestEntries: fs.Dirent[];
+		try {
+			requestEntries = fs.readdirSync(requestsDir, { withFileTypes: true });
+		} catch {
+			continue;
+		}
+		for (const requestEntry of requestEntries) {
+			if (requestEntry.isFile() && requestEntry.name.endsWith(".json")) files.push({ channelDir, file: path.join(requestsDir, requestEntry.name) });
+		}
+	}
+	return files;
+}
+
+function readDirectoryEntries(dir: string): fs.Dirent[] | undefined {
+	try {
+		return fs.readdirSync(dir, { withFileTypes: true });
+	} catch (error) {
+		if ((error as NodeJS.ErrnoException).code === "ENOENT") return [];
+		return undefined;
+	}
+}
+
+function directoryMtimeMs(dir: string): number {
+	try {
+		return fs.statSync(dir).mtimeMs;
+	} catch {
+		return 0;
+	}
+}
+
+function removeEmptyDirectory(dir: string): boolean {
+	try {
+		fs.rmdirSync(dir);
+		return true;
+	} catch (error) {
+		const code = (error as NodeJS.ErrnoException).code;
+		if (code === "ENOENT") return true;
+		if (code === "ENOTEMPTY" || code === "EEXIST" || code === "EPERM" || code === "EBUSY") return false;
+		throw error;
+	}
+}
+
+function removeStaleEmptySupervisorChannel(channelDir: string, nowMs: number): boolean {
+	const requestsDir = path.join(channelDir, REQUESTS_DIR);
+	const repliesDir = path.join(channelDir, REPLIES_DIR);
+	const newestKnownMtimeMs = Math.max(
+		directoryMtimeMs(channelDir),
+		directoryMtimeMs(requestsDir),
+		directoryMtimeMs(repliesDir),
+	);
+	if (nowMs - newestKnownMtimeMs < STALE_EMPTY_CHANNEL_AGE_MS) return false;
+
+	const requestEntries = readDirectoryEntries(requestsDir);
+	if (!requestEntries || requestEntries.length > 0) return false;
+	const replyEntries = readDirectoryEntries(repliesDir);
+	if (!replyEntries || replyEntries.length > 0) return false;
+
+	if (!removeEmptyDirectory(requestsDir)) return false;
+	if (!removeEmptyDirectory(repliesDir)) return false;
+	if (!removeEmptyDirectory(channelDir)) return false;
+	return true;
+}
+
+function cleanupStaleEmptySupervisorChannels(nowMs = Date.now()): number {
+	let channelEntries: fs.Dirent[];
+	try {
+		channelEntries = fs.readdirSync(SUPERVISOR_CHANNEL_ROOT, { withFileTypes: true });
+	} catch (error) {
+		if ((error as NodeJS.ErrnoException).code === "ENOENT") return 0;
+		throw error;
+	}
+
+	let removed = 0;
+	for (const entry of channelEntries) {
+		if (!entry.isDirectory()) continue;
+		try {
+			if (removeStaleEmptySupervisorChannel(path.join(SUPERVISOR_CHANNEL_ROOT, entry.name), nowMs)) removed++;
+		} catch {
+			// Cleanup is opportunistic; active writers can race with us and will be picked up by a later pass.
+		}
+	}
+	return removed;
+}
+
+function currentContextSessionId(state: Pick<SubagentState, "currentSessionId">, ctx: ExtensionContext): string | undefined {
+	try {
+		const sessionId = ctx.sessionManager.getSessionId();
+		if (sessionId) return sessionId;
+	} catch {
+		// Fall through to the last known identity.
+	}
+	return state.currentSessionId ?? undefined;
+}
+
+function requestMatchesContext(request: SupervisorRequest, state: Pick<SubagentState, "currentSessionId">, ctx: ExtensionContext): boolean {
+	const currentSessionId = currentContextSessionId(state, ctx);
+	return Boolean(currentSessionId && request.orchestratorSessionId === currentSessionId);
+}
+
+function rememberedForegroundChild(request: SupervisorRequest, state: SubagentState) {
+	const run = state.foregroundRuns?.get(request.runId);
+	const child = run?.children.find((candidate) => candidate.index === request.childIndex && candidate.agent === request.agent)
+		?? run?.children[request.childIndex];
+	return run && child ? { run, child } : undefined;
+}
+
+function markForegroundSupervisorAttention(request: SupervisorRequest, state: SubagentState): void {
+	const remembered = rememberedForegroundChild(request, state);
+	if (!remembered || remembered.child.status !== "detached") return;
+	const updatedAt = Date.now();
+	remembered.run.updatedAt = updatedAt;
+	remembered.child.activityState = "needs_attention";
+	remembered.child.lastActivityAt = request.createdAt;
+	remembered.child.currentTool = "contact_supervisor";
+	remembered.child.currentToolStartedAt = request.createdAt;
+	remembered.child.updatedAt = updatedAt;
+}
+
+function clearForegroundSupervisorAttention(request: SupervisorRequest, pending: Map<string, PendingSupervisorRequest>, state: SubagentState): void {
+	if ([...pending.values()].some((candidate) =>
+		candidate.expectsReply
+		&& candidate.runId === request.runId
+		&& candidate.agent === request.agent
+		&& candidate.childIndex === request.childIndex
+	)) return;
+	const remembered = rememberedForegroundChild(request, state);
+	if (!remembered || remembered.child.status !== "detached") return;
+	const updatedAt = Date.now();
+	remembered.run.updatedAt = updatedAt;
+	remembered.child.activityState = undefined;
+	remembered.child.lastActivityAt = updatedAt;
+	remembered.child.currentTool = undefined;
+	remembered.child.currentToolStartedAt = undefined;
+	remembered.child.updatedAt = updatedAt;
+}
+
+function removeRequestFile(file: string): void {
+	try {
+		fs.rmSync(file, { force: true });
+	} catch {
+		// Request cleanup is best-effort; reply files and timeout errors remain authoritative.
+	}
+}
+
+type SupervisorRequestLifecycle = "pending" | "resolved" | "expired" | "inactive" | "missing" | "wrong-session";
+
+function requestExpiresAt(request: SupervisorRequest, now: number): number {
+	const expiresAt = (request as { expiresAt?: unknown }).expiresAt;
+	if (typeof expiresAt === "number" && Number.isFinite(expiresAt)) return expiresAt;
+	return Number.isFinite(request.createdAt) ? request.createdAt + askTimeoutMs() : now;
+}
+
+function requestRunInactive(request: SupervisorRequest, state: SubagentState): boolean {
+	if (state.foregroundControls.has(request.runId)) return false;
+	const foreground = rememberedForegroundChild(request, state);
+	if (foreground) return foreground.child.status !== "detached";
+
+	const asyncJob = state.asyncJobs.get(request.runId);
+	if (!asyncJob) return false;
+	if (asyncJob.status === "complete" || asyncJob.status === "failed" || asyncJob.status === "paused") return true;
+	const stepStatus = asyncJob.steps?.[request.childIndex]?.status;
+	return stepStatus === "complete" || stepStatus === "completed" || stepStatus === "failed" || stepStatus === "paused";
+}
+
+function requestLifecycle(request: PendingSupervisorRequest, state: SubagentState, ctx: ExtensionContext | undefined, now: number): SupervisorRequestLifecycle {
+	if (ctx && !requestMatchesContext(request, state, ctx)) return "wrong-session";
+	if (!fs.existsSync(request.requestFile)) return "missing";
+	if (request.expectsReply && fs.existsSync(replyPath(request.channelDir, request.id))) return "resolved";
+	if (request.expectsReply && now > requestExpiresAt(request, now)) return "expired";
+	if (request.expectsReply && requestRunInactive(request, state)) return "inactive";
+	return "pending";
+}
+
+function cleanupRequestLifecycle(request: PendingSupervisorRequest, lifecycle: SupervisorRequestLifecycle): void {
+	if (lifecycle === "resolved" || lifecycle === "expired" || lifecycle === "inactive") removeRequestFile(request.requestFile);
+}
+
+function refreshPendingRequests(pending: Map<string, PendingSupervisorRequest>, state: SubagentState, ctx: ExtensionContext | undefined): void {
+	const now = Date.now();
+	for (const request of pending.values()) {
+		const lifecycle = requestLifecycle(request, state, ctx, now);
+		if (lifecycle === "pending") continue;
+		pending.delete(request.id);
+		cleanupRequestLifecycle(request, lifecycle);
+	}
+}
+
+function formatPendingLine(request: PendingSupervisorRequest): string {
+	const replyHint = request.expectsReply ? ` Reply: ${NATIVE_SUPERVISOR_TOOL_NAME}({ action: "reply", replyTo: "${request.id}", message: "..." })` : "";
+	return `- ${request.id}: ${request.agent} [${request.runId}#${request.childIndex}] ${request.reason}.${replyHint}`;
+}
+
+function requestVisibleText(request: PendingSupervisorRequest): string {
+	const lines = [request.message];
+	if (request.expectsReply) {
+		lines.push("", `Reply with: ${NATIVE_SUPERVISOR_TOOL_NAME}({ action: "reply", replyTo: "${request.id}", message: "..." })`);
+	}
+	return lines.join("\n");
+}
+
+function writeReply(request: PendingSupervisorRequest, message: string): void {
+	if (!message.trim()) throw new Error("message is required for supervisor replies.");
+	const reply: SupervisorReply = {
+		type: "subagent.supervisor.reply",
+		requestId: request.id,
+		createdAt: Date.now(),
+		message: message.trim(),
+	};
+	writeAtomicJson(replyPath(request.channelDir, request.id), reply);
+	removeRequestFile(request.requestFile);
+}
+
+function resolvePendingRequest(pending: Map<string, PendingSupervisorRequest>, params: IntercomParams): PendingSupervisorRequest {
+	if (params.replyTo) {
+		const request = pending.get(params.replyTo);
+		if (!request) throw new Error(`No pending supervisor request found for replyTo '${params.replyTo}'.`);
+		return request;
+	}
+	const requests = [...pending.values()].filter((request) => request.expectsReply);
+	if (params.to) {
+		const normalizedTo = params.to.toLowerCase();
+		const matches = requests.filter((request) =>
+			request.id.toLowerCase().startsWith(normalizedTo)
+			|| request.agent.toLowerCase() === normalizedTo
+			|| request.childTarget?.toLowerCase() === normalizedTo,
+		);
+		if (matches.length === 1) return matches[0]!;
+		if (matches.length > 1) throw new Error(`Multiple pending supervisor requests match '${params.to}'. Use replyTo.`);
+	}
+	if (requests.length === 1) return requests[0]!;
+	if (requests.length === 0) throw new Error("No pending supervisor requests need a reply.");
+	throw new Error("Multiple pending supervisor requests need replies. Use replyTo.");
+}
+
+function publicPendingRequests(pending: Map<string, PendingSupervisorRequest>): Array<Record<string, unknown>> {
+	return [...pending.values()].map((request) => ({
+		id: request.id,
+		runId: request.runId,
+		agent: request.agent,
+		childIndex: request.childIndex,
+		reason: request.reason,
+		expectsReply: request.expectsReply,
+	}));
+}
+
+function buildParentSupervisorTool(pending: Map<string, PendingSupervisorRequest>, state: SubagentState): ToolDefinition<typeof IntercomParamsSchema, Record<string, unknown>> {
+	return {
+		name: NATIVE_SUPERVISOR_TOOL_NAME,
+		label: "Subagent Supervisor",
+		description: "Native pi-subagents supervisor channel. Use reply/pending/status to answer child subagent requests without overriding pi-intercom.",
+		parameters: IntercomParamsSchema,
+		async execute(_id, params) {
+			refreshPendingRequests(pending, state, state.lastUiContext ?? undefined);
+			const input = params as IntercomParams;
+			if (input.action === "status") {
+				return { content: [{ type: "text", text: `Native supervisor channel active. Pending replies: ${pending.size}.` }], details: { active: true, pending: pending.size, root: SUPERVISOR_CHANNEL_ROOT } };
+			}
+			if (input.action === "pending" || input.action === "list") {
+				const lines = [...pending.values()].filter((request) => request.expectsReply).map(formatPendingLine);
+				return { content: [{ type: "text", text: lines.length ? lines.join("\n") : "No pending supervisor requests." }], details: { pending: publicPendingRequests(pending) } };
+			}
+			if (input.action === "reply") {
+				const request = resolvePendingRequest(pending, input);
+				writeReply(request, input.message ?? "");
+				pending.delete(request.id);
+				clearForegroundSupervisorAttention(request, pending, state);
+				return { content: [{ type: "text", text: `Replied to supervisor request ${request.id}.` }], details: { replyTo: request.id, runId: request.runId, agent: request.agent } };
+			}
+			if (input.action === "send" || input.action === "ask") {
+				throw new Error("The native subagent supervisor handles replies only. Child agents initiate asks with contact_supervisor.");
+			}
+			throw new Error(`Unsupported supervisor action: ${input.action}`);
+		},
+	};
+}
+
+export function createNativeSupervisorChannel(pi: ExtensionAPI, state: SubagentState, deps: NativeSupervisorChannelDeps = {}): { start: () => void; activateTransport: () => void; dispose: () => void; pending: Map<string, PendingSupervisorRequest> } {
+	const watch = deps.watch ?? fs.watch;
+	const timers = deps.timers ?? globalThis;
+	const pending = new Map<string, PendingSupervisorRequest>();
+	const seenFiles = new Set<string>();
+	const requestWatchers = new Map<string, fs.FSWatcher>();
+	let rootWatcher: fs.FSWatcher | undefined;
+	let poller: ReturnType<typeof setInterval> | undefined;
+	let safetyPoller: ReturnType<typeof setInterval> | undefined;
+	let deferredWatcherRefresh: ReturnType<typeof setImmediate> | undefined;
+	let started = false;
+	let lastStaleCleanupAt = 0;
+	const platform = deps.platform ?? process.platform;
+	const useNativeWatcher = () => shouldUseNativeFsWatch("supervisor-channel", platform) && platform !== "win32";
+	const hasTransportDemand = () => {
+		if (pending.size > 0) return true;
+		if (state.foregroundControls.size > 0) return true;
+		return [...state.asyncJobs.values()].some((job) => job.status === "queued" || job.status === "running");
+	};
+
+	const registerParentTools = (): void => {
+		if (!hasTool(pi, NATIVE_SUPERVISOR_TOOL_NAME)) pi.registerTool(buildParentSupervisorTool(pending, state));
+	};
+
+	const cleanupStaleChannelsIfDue = (): void => {
+		const nowMs = Date.now();
+		if (nowMs - lastStaleCleanupAt < STALE_EMPTY_CHANNEL_CLEANUP_INTERVAL_MS) return;
+		lastStaleCleanupAt = nowMs;
+		try {
+			cleanupStaleEmptySupervisorChannels(nowMs);
+		} catch {
+			// Supervisor delivery must not fail because best-effort temp cleanup failed.
+		}
+	};
+
+	const poll = (): void => {
+		cleanupStaleChannelsIfDue();
+		const ctx = state.lastUiContext;
+		if (!ctx) return;
+		refreshPendingRequests(pending, state, ctx);
+		const now = Date.now();
+		for (const { channelDir, file } of listRequestFiles()) {
+			if (seenFiles.has(file)) continue;
+			const request = parseRequestFile(file, channelDir);
+			if (!request || !requestMatchesContext(request, state, ctx)) continue;
+			const lifecycle = requestLifecycle(request, state, undefined, now);
+			if (lifecycle !== "pending") {
+				seenFiles.add(file);
+				cleanupRequestLifecycle(request, lifecycle);
+				continue;
+			}
+			seenFiles.add(file);
+			if (request.expectsReply) {
+				pending.set(request.id, request);
+				markForegroundSupervisorAttention(request, state);
+			}
+			else {
+				removeRequestFile(request.requestFile);
+			}
+			pi.sendMessage({
+				customType: "subagent_supervisor_request",
+				content: requestVisibleText(request),
+				display: true,
+				details: {
+					id: request.id,
+					reason: request.reason,
+					expectsReply: request.expectsReply,
+					runId: request.runId,
+					agent: request.agent,
+					childIndex: request.childIndex,
+				},
+			}, { triggerTurn: true });
+			if (request.expectsReply) {
+				(pi as { events?: IntercomEventBus }).events?.emit(INTERCOM_DETACH_REQUEST_EVENT, {
+					requestId: request.id,
+					runId: request.runId,
+					agent: request.agent,
+					childIndex: request.childIndex,
+				});
+				if (pending.has(request.id)) markForegroundSupervisorAttention(request, state);
+			}
+		}
+	};
+
+	const startPolling = (): void => {
+		if (poller) return;
+		poller = timers.setInterval(() => {
+			poll();
+			if (!useNativeWatcher() && platform === "darwin" && !hasTransportDemand()) {
+				if (poller) timers.clearInterval(poller);
+				poller = undefined;
+			}
+		}, CHANNEL_POLL_MS);
+		poller.unref?.();
+	};
+	const startSafetyPolling = (): void => {
+		if (safetyPoller) return;
+		safetyPoller = timers.setInterval(() => {
+			watchExistingRequestDirs();
+			poll();
+		}, CHANNEL_SAFETY_POLL_MS);
+		safetyPoller.unref?.();
+	};
+	const watchRequestDir = (requestsDir: string): void => {
+		if (requestWatchers.has(requestsDir)) return;
+		try {
+			const watcher = watch(requestsDir, () => poll());
+			watcher.on("error", () => {
+				try { watcher.close(); } catch {}
+				requestWatchers.delete(requestsDir);
+				startPolling();
+			});
+			watcher.unref?.();
+			requestWatchers.set(requestsDir, watcher);
+		} catch (error) {
+			if ((error as NodeJS.ErrnoException).code !== "ENOENT") startPolling();
+		}
+	};
+	const watchExistingRequestDirs = (): void => {
+		let channelEntries: fs.Dirent[];
+		try {
+			channelEntries = fs.readdirSync(SUPERVISOR_CHANNEL_ROOT, { withFileTypes: true });
+		} catch (error) {
+			if ((error as NodeJS.ErrnoException).code === "ENOENT") return;
+			startPolling();
+			return;
+		}
+		for (const entry of channelEntries) {
+			if (entry.isDirectory()) watchRequestDir(path.join(SUPERVISOR_CHANNEL_ROOT, entry.name, REQUESTS_DIR));
+		}
+	};
+	const scheduleWatcherRefresh = (): void => {
+		if (deferredWatcherRefresh) return;
+		deferredWatcherRefresh = timers.setImmediate(() => {
+			deferredWatcherRefresh = undefined;
+			if (!started) return;
+			watchExistingRequestDirs();
+			poll();
+		});
+		deferredWatcherRefresh.unref?.();
+	};
+
+	return {
+		activateTransport: () => {
+			if (!started) return;
+			poll();
+			if (!useNativeWatcher() && hasTransportDemand()) startPolling();
+		},
+		start: () => {
+			if (started) return;
+			started = true;
+			registerParentTools();
+			poll();
+			try {
+				fs.mkdirSync(SUPERVISOR_CHANNEL_ROOT, { recursive: true });
+				if (!useNativeWatcher()) {
+					if (platform === "win32") startPolling();
+					return;
+				}
+				watchExistingRequestDirs();
+				rootWatcher = watch(SUPERVISOR_CHANNEL_ROOT, () => {
+					watchExistingRequestDirs();
+					poll();
+					scheduleWatcherRefresh();
+				});
+				rootWatcher.on("error", startPolling);
+				startSafetyPolling();
+				scheduleWatcherRefresh();
+			} catch {
+				startPolling();
+			}
+		},
+		dispose: () => {
+			started = false;
+			try {
+				rootWatcher?.close();
+			} catch {
+				// Best effort during shutdown.
+			}
+			rootWatcher = undefined;
+			for (const watcher of requestWatchers.values()) {
+				try { watcher.close(); } catch {}
+			}
+			requestWatchers.clear();
+			if (poller) timers.clearInterval(poller);
+			poller = undefined;
+			if (safetyPoller) timers.clearInterval(safetyPoller);
+			safetyPoller = undefined;
+			if (deferredWatcherRefresh) timers.clearImmediate(deferredWatcherRefresh);
+			deferredWatcherRefresh = undefined;
+			pending.clear();
+			seenFiles.clear();
+		},
+		pending,
+	};
+}