@fitchmultz/pi-subagents 0.44.4 → 0.44.6

package/src/runs/foreground/question-control.ts

@@ -1,25 +1,30 @@
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import * as path from "node:path";
 import type { IntercomEventBus, SubagentExecutionResult } from "../../shared/types.ts";
-import { cancelSupervisorQuestion, claimQuestionRevival, formatSupervisorQuestions, listSupervisorQuestions, questionProcessAlive, questionRecoveryHint, readQuestionState, recordQuestionDelivery, releaseQuestionRevival, saveQuestionAnswer, type SupervisorQuestionView } from "../shared/supervisor-questions.ts";
+import { formatRunAction } from "../../shared/status-format.ts";
+import { cancelSupervisorQuestion, claimQuestionRevival, formatSupervisorQuestions, listSupervisorQuestions, questionProcessAlive, questionRecoveryHint, readQuestionState, recordQuestionDelivery, releaseQuestionRevival, saveQuestionAnswer, supervisorQuestionPage, type SupervisorQuestionView } from "../shared/supervisor-questions.ts";
 import { liveLaunchOverrideNotice, nestedResolutionScopeForExecutor, reviveSavedSubagent } from "./foreground-control.ts";
 import type { ExecutorDeps, SubagentParamsLike } from "./subagent-params.ts";
 
-function questionResult(questions: SupervisorQuestionView[], text = formatSupervisorQuestions(questions)): SubagentExecutionResult {
-	return { content: [{ type: "text", text }], details: { mode: "management", results: [], questions } };
+function questionResult(questions: SupervisorQuestionView[], text: string): SubagentExecutionResult {
+	return { content: [{ type: "text", text }], details: { mode: "management", results: [], ...supervisorQuestionPage(questions) } };
 }
 
 export function projectSupervisorQuestions(result: SubagentExecutionResult, params: SubagentParamsLike, ownerSessionId: string, childSafe = false): SubagentExecutionResult {
 	if (result.isError && !result.content.some((item) => item.type === "text" && /Async run not found|Status file not found/.test(item.text))) return result;
-	const questions = listSupervisorQuestions(ownerSessionId, params.id ?? params.runId ?? (params.dir ? path.basename(params.dir) : undefined))
+	const id = params.id ?? params.runId ?? (params.dir ? path.basename(params.dir) : undefined);
+	const questions = listSupervisorQuestions(ownerSessionId, id)
 		.filter((question) => question.state === "awaiting_input" || question.state === "answer_pending");
 	if (!questions.length) return result;
+	const page = supervisorQuestionPage(questions);
 	const questionOnly = result.isError && result.content.some((item) => item.type === "text" && /Async run not found|Status file not found/.test(item.text));
 	return {
 		...result,
 		...(questionOnly ? { isError: false } : {}),
-		content: [{ type: "text", text: [`Supervisor input (not execution completion):\n${formatSupervisorQuestions(questions, childSafe)}`, ...(questionOnly ? [] : result.content.map((item) => item.type === "text" ? item.text : ""))].join("\n\n") }],
-		details: { ...result.details, questions },
+		content: [{ type: "text", text: [`Supervisor input (not execution completion):\n${formatSupervisorQuestions(page.questions, childSafe)}`,
+			...(page.questionList.nextOffset !== undefined ? [`More questions: ${formatRunAction("questions", id, { offset: page.questionList.nextOffset, limit: page.questionList.limit }, childSafe)}`] : []),
+			...(questionOnly ? [] : result.content.map((item) => item.type === "text" ? item.text : ""))].join("\n\n") }],
+		details: { ...result.details, ...page },
 	};
 }
 
@@ -35,7 +40,7 @@ export function cancelSupervisorInput(result: SubagentExecutionResult, params: S
 	}
 	const cancelled = questions.map((question) => readQuestionState(question));
 	return result.isError ? questionResult(cancelled, `Cancelled ${questions.length} pending supervisor question(s). Any live waiter will abort its agent; cancellation is requested, not proof of process exit.`)
-		: { ...result, details: { ...result.details, questions: cancelled } };
+		: { ...result, details: { ...result.details, ...supervisorQuestionPage(cancelled) } };
 }
 
 export function controlSupervisorQuestion(input: { params: SubagentParamsLike; requestCwd: string; ctx: ExtensionContext; deps: ExecutorDeps }): SubagentExecutionResult {
@@ -45,8 +50,15 @@ export function controlSupervisorQuestion(input: { params: SubagentParamsLike; r
 		if (params.dir !== undefined) throw new Error("questions/answer use a run id, not dir.");
 		if (params.index !== undefined && (!Number.isSafeInteger(params.index) || params.index < 0)) throw new Error("index must be a non-negative integer.");
 		const questions = listSupervisorQuestions(input.ctx.sessionManager.getSessionId(), id)
-			.filter((question) => params.index === undefined || question.index === params.index);
-		if (params.action === "questions") return questionResult(questions, formatSupervisorQuestions(questions, Boolean(nestedResolutionScopeForExecutor(input.deps))));
+			.filter((question) => (params.index === undefined || question.index === params.index) && (params.action !== "questions" || params.questionId === undefined || question.questionId === params.questionId));
+		if (params.action === "questions") {
+			const page = supervisorQuestionPage(questions, params), childSafe = Boolean(nestedResolutionScopeForExecutor(input.deps));
+			const text = [formatSupervisorQuestions(page.questions, childSafe),
+				`Questions: ${page.questions.length} shown, ${page.questionList.total} total (offset ${page.questionList.offset}).`,
+				...(page.questionList.nextOffset !== undefined ? [`More questions: ${formatRunAction("questions", id, { offset: page.questionList.nextOffset, limit: page.questionList.limit,
+					...(params.index !== undefined ? { index: params.index } : {}), ...(params.questionId ? { questionId: params.questionId } : {}) }, childSafe)}`] : [])].join("\n\n");
+			return { content: [{ type: "text", text }], details: { mode: "management", results: [], ...page } };
+		}
 		if (!id || !params.questionId) throw new Error("action='answer' requires id and questionId.");
 		const question = questions.find((entry) => entry.questionId === params.questionId);
 		if (!question) throw new Error("Question not found in this session's runs. Resume the owning supervisor session to answer it.");
@@ -60,10 +72,10 @@ export function controlSupervisorQuestion(input: { params: SubagentParamsLike; r
 		const result = reviveSavedSubagent({ ...input, params: { ...params, message: `${answer.origin === "human" ? "Direct user answer (human origin)" : "Supervisor answer"} to question ${question.questionId}:\n\n${answer.message}\n\nOriginal question:\n${question.message}` } }, { ...question, source: "question" }, claim.runId);
 		if (result.isError) {
 			releaseQuestionRevival(question);
-			return { ...result, details: { ...result.details, questions: [readQuestionState(question)] } };
+			return { ...result, details: { ...result.details, ...supervisorQuestionPage([readQuestionState(question)]) } };
 		}
 		recordQuestionDelivery(question, { kind: "revive", runId: claim.runId, deliveredAt: Date.now() });
-		return { ...result, details: { ...result.details, questions: [readQuestionState(question)] } };
+		return { ...result, details: { ...result.details, ...supervisorQuestionPage([readQuestionState(question)]) } };
 	} catch (error) {
 		return { content: [{ type: "text", text: error instanceof Error ? error.message : String(error) }], isError: true, details: { mode: "management", results: [] } };
 	}

package/src/runs/foreground/wait-run.ts

@@ -2,7 +2,8 @@ import * as path from "node:path";
 import { writeAsyncControlRequest } from "../background/async-control.ts";
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { ownedRunExecutionResult, ownedRunProgressResult, ownedRunStatusResult, ownedRunView, resolveOwnedRun } from "../shared/run-records.ts";
-import { getRunMetadataDir, listOwnedRunQuestions, questionProcessAlive, readRunJson } from "../shared/supervisor-questions.ts";
+import { formatSupervisorQuestions, getRunMetadataDir, listOwnedRunQuestions, questionProcessAlive, readRunJson, supervisorQuestionPage } from "../shared/supervisor-questions.ts";
+import { formatRunAction } from "../../shared/status-format.ts";
 import { getSingleResultOutput, readStatus } from "../../shared/utils.ts";
 import { INTERCOM_DETACH_REQUEST_EVENT, INTERCOM_DETACH_RESPONSE_EVENT, POLL_INTERVAL_MS, type OwnedRun, type SubagentExecutionResult } from "../../shared/types.ts";
 import { resolveSubagentRunId } from "../background/run-id-resolver.ts";
@@ -86,7 +87,9 @@ export async function waitForOwnedRun(input: {
 				const questions = runQuestions.filter((question) => question.ownerSessionId === owner && (index === undefined || question.index === index) && question.state === "awaiting_input");
 				if (questions.length) {
 					const result = ownedRunStatusResult(target, deps.state);
-					result.details.questions = questions; finish("awaiting_input", `Run ${target.runId} needs input; waiting ended without stopping it.\n\n${questions.map((question) => `Question ${question.questionId}: ${question.message}`).join("\n\n")}`, result); return;
+					const page = supervisorQuestionPage(questions), childSafe = Boolean(nestedResolutionScopeForExecutor(deps));
+					Object.assign(result.details, page);
+					finish("awaiting_input", `Run ${target.runId} needs input; waiting ended without stopping it.\n\n${formatSupervisorQuestions(page.questions, childSafe)}\n\nAll questions: ${formatRunAction("questions", target.runId, index === undefined ? {} : { index }, childSafe)}`, result); return;
 				}
 				if ((index !== undefined || view.resultPath) && children.every((child) => child.result && child.state !== "live" && child.state !== "unknown") && (index !== undefined || view.state !== "live")) {
 					const result = ownedRunStatusResult(target, deps.state);

package/src/runs/shared/run-history.ts

@@ -63,6 +63,12 @@ export function recordRun(agent: string, task: string, exitCode: number, duratio
 		const agentDir = getAgentDir(); fs.mkdirSync(agentDir, { recursive: true });
 		db = openHistoryDatabase(path.join(historyDirectory(agentDir), TIMING_DATABASE));
 		const connection = db;
+		const imported = connection.prepare("SELECT 1 FROM sqlite_schema WHERE type='table' AND name='timing_meta'").get()
+			&& connection.prepare("SELECT key FROM timing_meta WHERE key='legacy-imported'").get();
+		// Filesystem reads and JSON parsing must not consume another writer's admission budget.
+		const legacy = imported ? [] : legacySamples(agentDir).reverse();
+		// Allow brief native writer overlap; three attempts still bound best-effort admission.
+		connection.exec("PRAGMA busy_timeout=1000");
 		historyTransaction(connection, () => {
 			connection.exec(`CREATE TABLE IF NOT EXISTS timing_meta(key TEXT PRIMARY KEY);
 				CREATE TABLE IF NOT EXISTS samples(sequence INTEGER PRIMARY KEY,agent TEXT NOT NULL,task TEXT NOT NULL,ts INTEGER NOT NULL,status TEXT NOT NULL,duration REAL NOT NULL,exit INTEGER);
@@ -70,7 +76,8 @@ export function recordRun(agent: string, task: string, exitCode: number, duratio
 			const insert = connection.prepare("INSERT INTO samples(agent,task,ts,status,duration,exit) VALUES (?,?,?,?,?,?)");
 			const save = (sample: RunEntry) => insert.run(sample.agent, sample.task, sample.ts, sample.status, sample.duration, sample.exit ?? null);
 			if (!connection.prepare("SELECT key FROM timing_meta WHERE key='legacy-imported'").get()) {
-				for (const sample of legacySamples(agentDir).reverse()) save(sample);
+				// Another writer may have imported while this snapshot was being read.
+				for (const sample of legacy) save(sample);
 				connection.exec("INSERT INTO timing_meta VALUES ('legacy-imported')");
 			}
 			save(entry);

package/src/runs/shared/supervisor-questions.ts

@@ -75,6 +75,46 @@ export interface SupervisorQuestionView extends SupervisorQuestion {
 	revival?: { runId: string; pid: number; startedAt: number };
 }
 
+export interface SupervisorQuestionSummary extends Pick<SupervisorQuestionView,
+	"questionId" | "runId" | "ownerSessionId" | "ownerTarget" | "agent" | "index" | "childSessionId" | "childTarget" |
+	"sessionFile" | "cwd" | "pid" | "processIdentity" | "createdAt" | "reason" | "message" | "state" | "answer" | "delivery" | "revival"> {
+	questionPath: string;
+	answerPath?: string;
+	messageTruncated?: boolean;
+	answerTruncated?: boolean;
+	hasInterview?: boolean;
+}
+
+export function summarizeSupervisorQuestion(question: SupervisorQuestionView): SupervisorQuestionSummary {
+	const directory = questionDir(question);
+	return {
+		questionId: question.questionId, runId: question.runId, ownerSessionId: question.ownerSessionId, ownerTarget: question.ownerTarget,
+		agent: question.agent, index: question.index, childSessionId: question.childSessionId, childTarget: question.childTarget,
+		sessionFile: question.sessionFile, cwd: question.cwd, pid: question.pid, processIdentity: question.processIdentity,
+		createdAt: question.createdAt, reason: question.reason, state: question.state, message: question.message.slice(0, 2048),
+		questionPath: path.join(directory, "question.json"),
+		...(question.message.length > 2048 ? { messageTruncated: true } : {}),
+		...(question.interview ? { hasInterview: true } : {}),
+		...(question.answer ? { answer: { message: question.answer.message.slice(0, 2048), answeredAt: question.answer.answeredAt, origin: question.answer.origin },
+			answerPath: path.join(directory, "answer.json"), ...(question.answer.message.length > 2048 ? { answerTruncated: true } : {}) } : {}),
+		...(question.delivery ? { delivery: { kind: question.delivery.kind, runId: question.delivery.runId, deliveredAt: question.delivery.deliveredAt } } : {}),
+		...(question.revival ? { revival: { runId: question.revival.runId, pid: question.revival.pid, startedAt: question.revival.startedAt } } : {}),
+	};
+}
+
+export function supervisorQuestionPage(questions: SupervisorQuestionView[], options: { offset?: number; limit?: number } = {}): {
+	questions: SupervisorQuestionSummary[];
+	questionList: { total: number; offset: number; limit: number; nextOffset?: number };
+} {
+	const offset = options.offset ?? 0, limit = options.limit ?? 20;
+	if (!Number.isSafeInteger(offset) || offset < 0) throw new Error("Question offset must be a non-negative integer.");
+	if (!Number.isSafeInteger(limit) || limit < 1 || limit > 100) throw new Error("Question limit must be from 1 to 100.");
+	const pending = (question: SupervisorQuestionView) => question.state === "awaiting_input" || question.state === "answer_pending" ? 0 : 1;
+	const sorted = questions.toSorted((a, b) => pending(a) - pending(b) || a.createdAt - b.createdAt || a.questionId.localeCompare(b.questionId));
+	return { questions: sorted.slice(offset, offset + limit).map((question) => summarizeSupervisorQuestion(question)),
+		questionList: { total: questions.length, offset, limit, ...(offset + limit < questions.length ? { nextOffset: offset + limit } : {}) } };
+}
+
 function safeId(value: string): string {
 	if (typeof value !== "string" || !/^[a-zA-Z0-9_-]+$/.test(value)) throw new Error("Invalid run or question ID.");
 	return value;
@@ -356,17 +396,20 @@ export function questionRecoveryHint(question: SupervisorQuestion, childSafe = f
 	return `Recover an unlaunched continuation: ${formatRunAction("resume", question.runId, { index: question.index, message: "Continue with the saved supervisor answer." }, childSafe)}`;
 }
 
-export function formatSupervisorQuestions(questions: SupervisorQuestionView[], childSafe = false): string {
+export function formatSupervisorQuestions(questions: SupervisorQuestionSummary[], childSafe = false): string {
 	if (!questions.length) return "No supervisor questions owned by this session.";
 	return questions.map((question) => [
 		`Question: ${question.questionId} | ${question.state}`,
 		`Run: ${question.runId} | Child: ${question.index} (${question.agent}) | Owner: ${question.ownerSessionId}`,
 		`Session: ${question.sessionFile} | Child target: ${question.childTarget}`,
 		question.message,
-		...(question.answer ? [`Saved answer: ${question.answer.message}`] : []),
+		...(question.messageTruncated ? [`[Question preview truncated. Full question: ${question.questionPath}]`] : []),
+		...(question.hasInterview ? [`Structured interview: ${question.questionPath}`] : []),
+		...(question.answer ? [`Saved answer: ${question.answer.message}`, ...(question.answerTruncated ? [`[Answer preview truncated. Exact saved answer: ${question.answerPath}]`] : [])] : []),
 		...(question.revival && !question.delivery ? [`Continuation requested: ${question.revival.runId}; delivery unconfirmed. Answer retained.`, questionRecoveryHint(question, childSafe)] : []),
 		question.delivery ? `Answer delivered via ${question.delivery.kind}; run: ${question.delivery.runId}`
 			: question.state === "cancelled" ? "Question cancelled; use continue for a new follow-up."
+			: question.answerTruncated ? `Retry answer with the exact saved message from ${question.answerPath}; a preview is not a valid replacement.`
 			: `Answer: ${formatRunAction("answer", question.runId, { questionId: question.questionId, message: question.answer?.message ?? "..." }, childSafe)}`,
 	].join("\n")).join("\n\n");
 }

package/src/shared/status-format.ts

@@ -6,11 +6,11 @@ export function formatAgentProcessExit(exit: AgentProcessExit | undefined): stri
 		: "Agent process exit not recorded. Command exit is unconfirmed.";
 }
 
-export function formatRunAction(action: ManagementAction | "questions" | "answer", id: string, fields: Record<string, string | number | boolean> = {}, childSafe = false): string {
+export function formatRunAction(action: ManagementAction | "questions" | "answer", id: string | undefined, fields: Record<string, string | number | boolean> = {}, childSafe = false): string {
 	const legacyChild = childSafe && loadConfig().compactChildTools === false;
 	const parentAction = { status: "inspect", resume: "continue", interrupt: "stop" };
 	const name = legacyChild ? action : parentAction[action as keyof typeof parentAction] ?? action;
-	const args = Object.entries({ action: name, id, ...fields }).map(([key, value]) => `${key}: ${JSON.stringify(value)}`).join(", ");
+	const args = Object.entries({ action: name, ...(id !== undefined ? { id } : {}), ...fields }).map(([key, value]) => `${key}: ${JSON.stringify(value)}`).join(", ");
 	const call = `${legacyChild || action === "extend" ? "subagent" : "agent_runs"}({ ${args} })`;
 	return action === "extend" && !legacyChild ? `load_subagent({}), then ${call}` : call;
 }

package/src/shared/types.ts

@@ -580,7 +580,8 @@ export interface Details {
 	intercomTargets?: string[];
 	managementControl?: ManagementControl;
 	managementControls?: ManagementControl[];
-	questions?: import("../runs/shared/supervisor-questions.ts").SupervisorQuestionView[];
+	questions?: import("../runs/shared/supervisor-questions.ts").SupervisorQuestionSummary[];
+	questionList?: { total: number; offset: number; limit: number; nextOffset?: number };
 	wait?: { runId: string; completionId?: string; index?: number; status: "completed" | "cancelled" | "yielded" | "awaiting_input" | "unavailable" };
 	run?: OwnedRunView;
 	runs?: Array<Pick<OwnedRunView, "runId" | "source" | "mode" | "cwd" | "task" | "state" | "updatedAt" | "attention" | "review" | "rootRunId" | "predecessorRunId" | "predecessorIndex"> & { summary?: string; continuations?: string[] }>;