pi-crew 0.1.46 → 0.1.49

package/src/runtime/supervisor-contact.ts

@@ -1,59 +1,59 @@
-import type { TeamRunManifest } from "../state/types.ts";
-import { appendEvent } from "../state/event-log.ts";
-import { logInternalError } from "../utils/internal-error.ts";
-
-export interface SupervisorContactPayload {
-	runId: string;
-	taskId: string;
-	reason: "decision_needed" | "clarification" | "approval" | "error_escalation" | "custom";
-	message: string;
-	data?: Record<string, unknown>;
-	timestamp: string;
-}
-
-/**
- * Record a supervisor contact event from a child task.
- * This represents a child→parent communication where the child needs
- * a decision, clarification, or approval to continue.
- */
-export function recordSupervisorContact(manifest: TeamRunManifest, payload: Omit<SupervisorContactPayload, "timestamp">): void {
-	const fullPayload: SupervisorContactPayload = {
-		...payload,
-		timestamp: new Date().toISOString(),
-	};
-	try {
-		appendEvent(manifest.eventsPath, {
-			type: "supervisor.contact",
-			runId: manifest.runId,
-			taskId: payload.taskId,
-			data: fullPayload as unknown as Record<string, unknown>,
-		});
-	} catch (error) {
-		logInternalError("supervisor-contact.record", error, `runId=${manifest.runId} taskId=${payload.taskId}`);
-	}
-}
-
-/**
- * Parse a supervisor contact request from child Pi stdout.
- * Detects structured JSON lines with type "supervisor_contact".
- */
-export function parseSupervisorContactFromLine(line: string): Omit<SupervisorContactPayload, "timestamp" | "runId"> | undefined {
-	if (!line.trim()) return undefined;
-	let parsed: unknown;
-	try {
-		parsed = JSON.parse(line);
-	} catch {
-		return undefined;
-	}
-	if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return undefined;
-	const record = parsed as Record<string, unknown>;
-	if (record.type !== "supervisor_contact" && record.type !== "crew_supervisor_contact") return undefined;
-	return {
-		taskId: typeof record.taskId === "string" ? record.taskId : "",
-		reason: typeof record.reason === "string" && ["decision_needed", "clarification", "approval", "error_escalation", "custom"].includes(record.reason)
-			? record.reason as SupervisorContactPayload["reason"]
-			: "custom",
-		message: typeof record.message === "string" ? record.message : String(record.message ?? ""),
-		data: record.data && typeof record.data === "object" && !Array.isArray(record.data) ? record.data as Record<string, unknown> : undefined,
-	};
-}
+import type { TeamRunManifest } from "../state/types.ts";
+import { appendEvent } from "../state/event-log.ts";
+import { logInternalError } from "../utils/internal-error.ts";
+
+export interface SupervisorContactPayload {
+	runId: string;
+	taskId: string;
+	reason: "decision_needed" | "clarification" | "approval" | "error_escalation" | "custom";
+	message: string;
+	data?: Record<string, unknown>;
+	timestamp: string;
+}
+
+/**
+ * Record a supervisor contact event from a child task.
+ * This represents a child→parent communication where the child needs
+ * a decision, clarification, or approval to continue.
+ */
+export function recordSupervisorContact(manifest: TeamRunManifest, payload: Omit<SupervisorContactPayload, "timestamp">): void {
+	const fullPayload: SupervisorContactPayload = {
+		...payload,
+		timestamp: new Date().toISOString(),
+	};
+	try {
+		appendEvent(manifest.eventsPath, {
+			type: "supervisor.contact",
+			runId: manifest.runId,
+			taskId: payload.taskId,
+			data: fullPayload as unknown as Record<string, unknown>,
+		});
+	} catch (error) {
+		logInternalError("supervisor-contact.record", error, `runId=${manifest.runId} taskId=${payload.taskId}`);
+	}
+}
+
+/**
+ * Parse a supervisor contact request from child Pi stdout.
+ * Detects structured JSON lines with type "supervisor_contact".
+ */
+export function parseSupervisorContactFromLine(line: string): Omit<SupervisorContactPayload, "timestamp" | "runId"> | undefined {
+	if (!line.trim()) return undefined;
+	let parsed: unknown;
+	try {
+		parsed = JSON.parse(line);
+	} catch {
+		return undefined;
+	}
+	if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return undefined;
+	const record = parsed as Record<string, unknown>;
+	if (record.type !== "supervisor_contact" && record.type !== "crew_supervisor_contact") return undefined;
+	return {
+		taskId: typeof record.taskId === "string" ? record.taskId : "",
+		reason: typeof record.reason === "string" && ["decision_needed", "clarification", "approval", "error_escalation", "custom"].includes(record.reason)
+			? record.reason as SupervisorContactPayload["reason"]
+			: "custom",
+		message: typeof record.message === "string" ? record.message : String(record.message ?? ""),
+		data: record.data && typeof record.data === "object" && !Array.isArray(record.data) ? record.data as Record<string, unknown> : undefined,
+	};
+}

package/src/runtime/task-display.ts

@@ -1,38 +1,38 @@
-import type { TeamTaskState } from "../state/types.ts";
-import type { CrewAgentRecord, CrewRuntimeKind } from "./crew-agent-runtime.ts";
-import { recordFromTask } from "./crew-agent-records.ts";
-import type { TeamRunManifest } from "../state/types.ts";
-
-export function shouldMaterializeAgent(task: TeamTaskState): boolean {
-	return task.status !== "queued" && task.status !== "skipped";
-}
-
-export function recordsForMaterializedTasks(manifest: TeamRunManifest, tasks: TeamTaskState[], runtime: CrewRuntimeKind): CrewAgentRecord[] {
-	return tasks.filter(shouldMaterializeAgent).map((task) => recordFromTask(manifest, task, runtime));
-}
-
-export function taskById(tasks: TeamTaskState[]): Map<string, TeamTaskState> {
-	const map = new Map<string, TeamTaskState>();
-	for (const task of tasks) {
-		map.set(task.id, task);
-		if (task.stepId) map.set(task.stepId, task);
-	}
-	return map;
-}
-
-export function waitingReason(task: TeamTaskState, tasks: TeamTaskState[]): string | undefined {
-	if (task.status !== "queued") return undefined;
-	const byId = taskById(tasks);
-	const waiting = task.dependsOn.map((id) => byId.get(id)?.id ?? id).filter((id) => byId.get(id)?.status !== "completed");
-	if (waiting.length === 0) return "ready";
-	return `waiting for ${waiting.join(", ")}`;
-}
-
-export function formatTaskGraphLines(tasks: TeamTaskState[]): string[] {
-	if (tasks.length === 0) return ["- (none)"];
-	return tasks.map((task) => {
-		const icon = task.status === "completed" ? "✓" : task.status === "running" ? "⠋" : task.status === "failed" ? "✗" : task.status === "cancelled" || task.status === "skipped" ? "■" : "◦";
-		const wait = waitingReason(task, tasks);
-		return `- ${icon} ${task.id} [${task.status}] ${task.role}->${task.agent}${wait && wait !== "ready" ? ` (${wait})` : ""}`;
-	});
-}
+import type { TeamTaskState } from "../state/types.ts";
+import type { CrewAgentRecord, CrewRuntimeKind } from "./crew-agent-runtime.ts";
+import { recordFromTask } from "./crew-agent-records.ts";
+import type { TeamRunManifest } from "../state/types.ts";
+
+export function shouldMaterializeAgent(task: TeamTaskState): boolean {
+	return task.status !== "queued" && task.status !== "skipped";
+}
+
+export function recordsForMaterializedTasks(manifest: TeamRunManifest, tasks: TeamTaskState[], runtime: CrewRuntimeKind): CrewAgentRecord[] {
+	return tasks.filter(shouldMaterializeAgent).map((task) => recordFromTask(manifest, task, runtime));
+}
+
+export function taskById(tasks: TeamTaskState[]): Map<string, TeamTaskState> {
+	const map = new Map<string, TeamTaskState>();
+	for (const task of tasks) {
+		map.set(task.id, task);
+		if (task.stepId) map.set(task.stepId, task);
+	}
+	return map;
+}
+
+export function waitingReason(task: TeamTaskState, tasks: TeamTaskState[]): string | undefined {
+	if (task.status !== "queued") return undefined;
+	const byId = taskById(tasks);
+	const waiting = task.dependsOn.map((id) => byId.get(id)?.id ?? id).filter((id) => byId.get(id)?.status !== "completed");
+	if (waiting.length === 0) return "ready";
+	return `waiting for ${waiting.join(", ")}`;
+}
+
+export function formatTaskGraphLines(tasks: TeamTaskState[]): string[] {
+	if (tasks.length === 0) return ["- (none)"];
+	return tasks.map((task) => {
+		const icon = task.status === "completed" ? "✓" : task.status === "running" ? "⠋" : task.status === "failed" ? "✗" : task.status === "cancelled" || task.status === "skipped" ? "■" : "◦";
+		const wait = waitingReason(task, tasks);
+		return `- ${icon} ${task.id} [${task.status}] ${task.role}->${task.agent}${wait && wait !== "ready" ? ` (${wait})` : ""}`;
+	});
+}

package/src/runtime/task-output-context.ts

@@ -5,8 +5,19 @@ import { writeArtifact } from "../state/artifact-store.ts";
 import { resolveRealContainedPath } from "../utils/safe-paths.ts";
 import type { WorkflowStep } from "../workflows/workflow-config.ts";
 
+export interface DependencyContextEntry {
+	taskId: string;
+	role: string;
+	status: string;
+	resultSummary: string;
+	resultPath?: string;
+	structuredResults?: Record<string, unknown>;
+	artifactsProduced?: string[];
+	usage?: { inputTokens: number; outputTokens: number; durationMs: number };
+}
+
 export interface DependencyOutputContext {
-	dependencies: Array<{ taskId: string; title: string; status: string; result?: string; resultPath?: string }>;
+	dependencies: DependencyContextEntry[];
 	sharedReads: Array<{ name: string; path: string; content: string }>;
 }
 
@@ -44,16 +55,52 @@ export function sharedPath(manifest: TeamRunManifest, name: string): string {
 	return resolved;
 }
 
+function tryParseJson(text: string): Record<string, unknown> | undefined {
+	try {
+		const parsed = JSON.parse(text);
+		if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) return parsed as Record<string, unknown>;
+	} catch {
+		// Not valid JSON object — return undefined.
+	}
+	return undefined;
+}
+
+function listTaskArtifacts(manifest: TeamRunManifest, taskId: string): string[] | undefined {
+	const produced = manifest.artifacts.filter((a) => a.producer === taskId);
+	if (produced.length === 0) return undefined;
+	return produced.map((a) => {
+		const relative = path.relative(manifest.artifactsRoot, a.path);
+		return relative.startsWith("..") ? a.path : relative;
+	});
+}
+
+function aggregateUsage(task: TeamTaskState): DependencyContextEntry["usage"] {
+	if (!task.usage) return undefined;
+	const inputTokens = task.usage.input ?? 0;
+	const outputTokens = task.usage.output ?? 0;
+	const started = task.startedAt ? new Date(task.startedAt).getTime() : 0;
+	const finished = task.finishedAt ? new Date(task.finishedAt).getTime() : 0;
+	const durationMs = started && finished ? finished - started : 0;
+	if (inputTokens === 0 && outputTokens === 0 && durationMs === 0) return undefined;
+	return { inputTokens, outputTokens, durationMs };
+}
+
 export function collectDependencyOutputContext(manifest: TeamRunManifest, tasks: TeamTaskState[], task: TeamTaskState, step: WorkflowStep): DependencyOutputContext {
 	const byStep = new Map(tasks.map((item) => [item.stepId, item]).filter((entry): entry is [string, TeamTaskState] => Boolean(entry[0])));
 	const byId = new Map(tasks.map((item) => [item.id, item]));
-	const dependencies = task.dependsOn.map((dep) => byStep.get(dep) ?? byId.get(dep)).filter((item): item is TeamTaskState => Boolean(item)).map((item) => ({
-		taskId: item.id,
-		title: item.title,
-		status: item.status,
-		resultPath: item.resultArtifact?.path,
-		result: item.resultArtifact ? readIfSmall(item.resultArtifact.path, 24_000, manifest.artifactsRoot) : undefined,
-	}));
+	const dependencies = task.dependsOn.map((dep) => byStep.get(dep) ?? byId.get(dep)).filter((item): item is TeamTaskState => Boolean(item)).map((item) => {
+		const resultText = item.resultArtifact ? readIfSmall(item.resultArtifact.path, 24_000, manifest.artifactsRoot) : undefined;
+		return {
+			taskId: item.id,
+			role: item.role,
+			status: item.status,
+			resultSummary: resultText ?? "",
+			resultPath: item.resultArtifact?.path,
+			structuredResults: resultText ? tryParseJson(resultText) : undefined,
+			artifactsProduced: listTaskArtifacts(manifest, item.id),
+			usage: aggregateUsage(item),
+		};
+	});
 	const sharedReads = (step.reads === false ? [] : step.reads ?? []).map((name) => {
 		const filePath = sharedPath(manifest, name);
 		return { name, path: filePath, content: readIfSmall(filePath, 24_000, path.resolve(manifest.artifactsRoot, "shared")) ?? "" };
@@ -66,7 +113,10 @@ export function renderDependencyOutputContext(context: DependencyOutputContext):
 	if (context.dependencies.length) {
 		parts.push("# Dependency Outputs", "");
 		for (const dep of context.dependencies) {
-			parts.push(`## ${dep.taskId} (${dep.title})`, `Status: ${dep.status}`, dep.resultPath ? `Result artifact: ${dep.resultPath}` : "", "", dep.result?.trim() || "(no result output)", "");
+			parts.push(`## ${dep.taskId} (${dep.role})`, `Status: ${dep.status}`, dep.resultPath ? `Result artifact: ${dep.resultPath}` : "", "", dep.resultSummary?.trim() || "(no result output)", "");
+			if (dep.structuredResults) parts.push("Structured results:", JSON.stringify(dep.structuredResults, null, 2), "");
+			if (dep.artifactsProduced?.length) parts.push(`Artifacts produced: ${dep.artifactsProduced.join(", ")}`, "");
+			if (dep.usage) parts.push(`Usage: ${dep.usage.inputTokens} input tokens, ${dep.usage.outputTokens} output tokens, ${dep.usage.durationMs}ms`, "");
 		}
 	}
 	if (context.sharedReads.length) {

package/src/runtime/task-runner/capabilities.ts

@@ -1,78 +1,78 @@
-import type { AgentConfig } from "../../agents/agent-config.ts";
-import type { CrewRuntimeKind } from "../crew-agent-runtime.ts";
-
-export interface WorkerCapabilityInventory {
-	schemaVersion: 1;
-	taskId: string;
-	role: string;
-	agent: string;
-	runtime: CrewRuntimeKind;
-	permissionMode: string;
-	tools: string[];
-	extensions: string[];
-	skills: {
-		names: string[];
-		paths: string[];
-		disabled: boolean;
-	};
-	model: {
-		requested?: string;
-		agentDefault?: string;
-		fallbacks: string[];
-		teamRole?: string;
-		step?: string;
-	};
-	inheritance: {
-		projectContext: boolean;
-		skills: boolean;
-		systemPromptMode: "replace" | "append";
-	};
-}
-
-export interface BuildWorkerCapabilityInventoryInput {
-	taskId: string;
-	role: string;
-	agent: AgentConfig;
-	runtime: CrewRuntimeKind;
-	permissionMode: string;
-	skillNames?: string[];
-	skillPaths?: string[];
-	skillsDisabled: boolean;
-	modelOverride?: string;
-	teamRoleModel?: string;
-	stepModel?: string;
-}
-
-function uniqueSorted(values: readonly string[] | undefined): string[] {
-	return [...new Set((values ?? []).map((value) => value.trim()).filter(Boolean))].sort((a, b) => a.localeCompare(b));
-}
-
-export function buildWorkerCapabilityInventory(input: BuildWorkerCapabilityInventoryInput): WorkerCapabilityInventory {
-	return {
-		schemaVersion: 1,
-		taskId: input.taskId,
-		role: input.role,
-		agent: input.agent.name,
-		runtime: input.runtime,
-		permissionMode: input.permissionMode,
-		tools: uniqueSorted(input.agent.tools),
-		extensions: uniqueSorted(input.agent.extensions),
-		skills: {
-			names: uniqueSorted(input.skillNames),
-			paths: uniqueSorted(input.skillPaths),
-			disabled: input.skillsDisabled,
-		},
-		model: {
-			requested: input.modelOverride,
-			agentDefault: input.agent.model,
-			fallbacks: uniqueSorted(input.agent.fallbackModels),
-			teamRole: input.teamRoleModel,
-			step: input.stepModel,
-		},
-		inheritance: {
-			projectContext: input.agent.inheritProjectContext === true,
-			skills: input.agent.inheritSkills === true,
-			systemPromptMode: input.agent.systemPromptMode ?? "replace",
-		},
-	};
-}
+import type { AgentConfig } from "../../agents/agent-config.ts";
+import type { CrewRuntimeKind } from "../crew-agent-runtime.ts";
+
+export interface WorkerCapabilityInventory {
+	schemaVersion: 1;
+	taskId: string;
+	role: string;
+	agent: string;
+	runtime: CrewRuntimeKind;
+	permissionMode: string;
+	tools: string[];
+	extensions: string[];
+	skills: {
+		names: string[];
+		paths: string[];
+		disabled: boolean;
+	};
+	model: {
+		requested?: string;
+		agentDefault?: string;
+		fallbacks: string[];
+		teamRole?: string;
+		step?: string;
+	};
+	inheritance: {
+		projectContext: boolean;
+		skills: boolean;
+		systemPromptMode: "replace" | "append";
+	};
+}
+
+export interface BuildWorkerCapabilityInventoryInput {
+	taskId: string;
+	role: string;
+	agent: AgentConfig;
+	runtime: CrewRuntimeKind;
+	permissionMode: string;
+	skillNames?: string[];
+	skillPaths?: string[];
+	skillsDisabled: boolean;
+	modelOverride?: string;
+	teamRoleModel?: string;
+	stepModel?: string;
+}
+
+function uniqueSorted(values: readonly string[] | undefined): string[] {
+	return [...new Set((values ?? []).map((value) => value.trim()).filter(Boolean))].sort((a, b) => a.localeCompare(b));
+}
+
+export function buildWorkerCapabilityInventory(input: BuildWorkerCapabilityInventoryInput): WorkerCapabilityInventory {
+	return {
+		schemaVersion: 1,
+		taskId: input.taskId,
+		role: input.role,
+		agent: input.agent.name,
+		runtime: input.runtime,
+		permissionMode: input.permissionMode,
+		tools: uniqueSorted(input.agent.tools),
+		extensions: uniqueSorted(input.agent.extensions),
+		skills: {
+			names: uniqueSorted(input.skillNames),
+			paths: uniqueSorted(input.skillPaths),
+			disabled: input.skillsDisabled,
+		},
+		model: {
+			requested: input.modelOverride,
+			agentDefault: input.agent.model,
+			fallbacks: uniqueSorted(input.agent.fallbackModels),
+			teamRole: input.teamRoleModel,
+			step: input.stepModel,
+		},
+		inheritance: {
+			projectContext: input.agent.inheritProjectContext === true,
+			skills: input.agent.inheritSkills === true,
+			systemPromptMode: input.agent.systemPromptMode ?? "replace",
+		},
+	};
+}

package/src/runtime/task-runner/live-executor.ts

@@ -84,6 +84,8 @@ export async function runLiveTask(input: RunLiveTaskInput): Promise<RunLiveTaskO
 		modelOverride: input.modelOverride,
 		teamRoleModel: input.teamRoleModel,
 		isCurrent,
+		// Phase 2: Pass output schema for yield validation
+		outputSchema: undefined,
 		onOutput: (text) => appendCrewAgentOutput(manifest, task.id, text),
 		onEvent: (event) => {
 			appendCrewAgentEvent(manifest, task.id, event);