pi-subagents 0.40.0 → 0.41.0

package/src/slash/delegation-adapters.ts

@@ -1,52 +1,25 @@
 import {
-	SUBAGENT_DELEGATION_PROTOCOL_VERSION,
-	SUBAGENT_DELEGATION_V2_PROTOCOL_VERSION,
-	type SubagentDelegationAcceptanceResult,
-	type SubagentDelegationEffectsResult,
-	type SubagentDelegationExecutionResult,
 	type SubagentDelegationRequest,
 	type SubagentDelegationResponse,
-	type SubagentDelegationReviewResult,
 	type SubagentDelegationStatus,
+	type SubagentDelegationThinking,
 	type SubagentDelegationUpdate,
-	type SubagentDelegationV2Request,
-	type SubagentDelegationV2Response,
-	type SubagentDelegationV2Thinking,
-	type SubagentDelegationV2Value,
-	type SubagentDelegationV2Update,
+	type SubagentDelegationValue,
 } from "../api/delegation.ts";
 import type { AcceptanceInput, AgentContract, EffectsProjection, ExecutionProjection, JsonSchemaObject, ReviewProjection, ToolBudgetConfig, TurnBudgetConfig, Usage } from "../shared/types.ts";
-import { isAgentContractV1 } from "../runs/shared/agent-contract.ts";
 import { cloneJsonWithinByteLimit } from "./delegation-json.ts";
 
-export interface PromptTemplateDelegationTask {
-	agent: string;
-	task: string;
-	model?: string;
-	cwd?: string;
-}
-
-export interface PromptTemplateDelegationParallelResult {
-	agent: string;
-	messages: unknown[];
-	isError: boolean;
-	errorText?: string;
-}
-
 export interface PromptTemplateDelegationRequest {
 	requestId: string;
 	agent: string;
 	task: string;
-	tasks?: PromptTemplateDelegationTask[];
 	context: "fresh" | "fork";
 	model: string;
 	cwd: string;
-	worktree?: boolean;
 }
 
 export interface PromptTemplateDelegationResponse extends PromptTemplateDelegationRequest {
 	messages: unknown[];
-	parallelResults?: PromptTemplateDelegationParallelResult[];
 	contentText?: string;
 	isError: boolean;
 	errorText?: string;
@@ -82,11 +55,17 @@ export interface PromptTemplateDelegationUpdate {
 	taskProgress?: PromptTemplateDelegationTaskProgress[];
 }
 
+interface DelegationAcceptanceSnapshot {
+	status: string;
+	evidenceStatus?: string;
+	explicit?: boolean;
+}
+
 export interface PromptTemplateBridgeResult {
 	isError?: boolean;
 	content?: unknown;
 	details?: {
-		mode?: "single" | "parallel" | "chain" | "management";
+		mode?: "single" | "parallel" | "chain" | "workflow" | "management";
 		runId?: string;
 		timedOut?: boolean;
 		stopped?: boolean;
@@ -110,7 +89,7 @@ export interface PromptTemplateBridgeResult {
 			sessionFile?: string;
 			agentContract?: AgentContract;
 			execution?: ExecutionProjection;
-			acceptance?: SubagentDelegationAcceptanceResult;
+			acceptance?: DelegationAcceptanceSnapshot;
 			review?: ReviewProjection;
 			effects?: EffectsProjection;
 			usage?: Usage;
@@ -137,14 +116,12 @@ export interface PromptTemplateBridgeResult {
 export interface DelegatedSubagentExecutionParams {
 	agent?: string;
 	task?: string;
-	tasks?: PromptTemplateDelegationTask[];
 	context: "fresh" | "fork";
 	model?: string;
 	cwd: string;
-	worktree?: boolean;
 	timeoutMs?: number;
 	turnBudget?: TurnBudgetConfig;
-	/** Internal-only strict turn-boundary enforcement for versioned foreground delegation. */
+	/** Internal-only strict turn-boundary enforcement for structured foreground delegation. */
 	enforceHardTurnLimit?: boolean;
 	toolBudget?: ToolBudgetConfig;
 	skill?: string | string[] | boolean;
@@ -155,60 +132,31 @@ export interface DelegatedSubagentExecutionParams {
 	acceptance?: AcceptanceInput;
 	artifacts?: boolean;
 	/** Internal-only thinking override accepted by executeDelegated. */
-	delegatedThinkingOverride?: SubagentDelegationV2Thinking;
-	/** Internal-only V2 capability accepted and stripped by executeDelegated. */
+	delegatedThinkingOverride?: SubagentDelegationThinking;
+	/** Internal-only capability accepted and stripped by executeDelegated. */
 	delegatedAllowZeroToolBudget?: true;
 	async: false;
 	foregroundOnly: true;
 	clarify: false;
 }
 
-function parseDelegationTasks(tasks: unknown): PromptTemplateDelegationTask[] {
-	if (!Array.isArray(tasks)) return [];
-	const parsed: PromptTemplateDelegationTask[] = [];
-	for (const item of tasks) {
-		if (!item || typeof item !== "object") return [];
-		const value = item as Partial<PromptTemplateDelegationTask>;
-		if (typeof value.agent !== "string" || !value.agent.trim()) return [];
-		if (typeof value.task !== "string" || !value.task.trim()) return [];
-		const model = typeof value.model === "string" && value.model.trim().length > 0 ? value.model : undefined;
-		const cwd = typeof value.cwd === "string" && value.cwd.trim().length > 0 ? value.cwd : undefined;
-		parsed.push({
-			agent: value.agent,
-			task: value.task,
-			...(model ? { model } : {}),
-			...(cwd ? { cwd } : {}),
-		});
-	}
-	return parsed;
-}
-
 export function parsePromptTemplateRequest(data: unknown): PromptTemplateDelegationRequest | undefined {
 	if (!data || typeof data !== "object") return undefined;
-	const value = data as Partial<PromptTemplateDelegationRequest> & { tasks?: unknown };
+	const value = data as Partial<PromptTemplateDelegationRequest> & { tasks?: unknown; worktree?: unknown };
+	if (value.tasks !== undefined || value.worktree !== undefined) return undefined;
 	if (typeof value.requestId !== "string" || !value.requestId) return undefined;
+	if (typeof value.agent !== "string" || !value.agent) return undefined;
+	if (typeof value.task !== "string" || !value.task) return undefined;
 	if (typeof value.model !== "string" || !value.model) return undefined;
 	if (typeof value.cwd !== "string" || !value.cwd) return undefined;
 	if (value.context !== "fresh" && value.context !== "fork") return undefined;
-	const tasks = parseDelegationTasks(value.tasks);
-	const worktree = value.worktree === true ? true : undefined;
-	const hasSingle =
-		typeof value.agent === "string" &&
-		value.agent.length > 0 &&
-		typeof value.task === "string" &&
-		value.task.length > 0;
-	if (!hasSingle && tasks.length === 0) return undefined;
-
-	const fallbackTask = tasks[0];
 	return {
 		requestId: value.requestId,
-		agent: hasSingle ? value.agent! : fallbackTask!.agent,
-		task: hasSingle ? value.task! : fallbackTask!.task,
-		...(tasks.length > 0 ? { tasks } : {}),
+		agent: value.agent,
+		task: value.task,
 		context: value.context,
 		model: value.model,
 		cwd: value.cwd,
-		...(worktree ? { worktree } : {}),
 	};
 }
 
@@ -339,17 +287,6 @@ export function toDelegationUpdate(requestId: string, update: PromptTemplateBrid
 }
 
 export function toLegacyExecutionParams(request: PromptTemplateDelegationRequest): DelegatedSubagentExecutionParams {
-	if (request.tasks && request.tasks.length > 0) {
-		return {
-			tasks: request.tasks,
-			context: request.context,
-			cwd: request.cwd,
-			worktree: request.worktree,
-			async: false,
-			foregroundOnly: true,
-			clarify: false,
-		};
-	}
 	return {
 		agent: request.agent,
 		task: request.task,
@@ -363,30 +300,6 @@ export function toLegacyExecutionParams(request: PromptTemplateDelegationRequest
 }
 
 export function toSubagentDelegationExecutionParams(request: SubagentDelegationRequest): DelegatedSubagentExecutionParams {
-	return {
-		agent: request.agent,
-		task: request.task,
-		context: request.context,
-		cwd: request.cwd,
-		model: request.model,
-		timeoutMs: request.timeoutMs,
-		turnBudget: request.turnBudget,
-		enforceHardTurnLimit: true,
-		toolBudget: request.toolBudget,
-		skill: request.skill,
-		output: request.output,
-		outputMode: request.outputMode,
-		outputSchema: request.outputSchema,
-		agentContract: request.agentContract,
-		acceptance: request.acceptance,
-		artifacts: request.artifacts,
-		async: false,
-		foregroundOnly: true,
-		clarify: false,
-	};
-}
-
-export function toSubagentDelegationV2ExecutionParams(request: SubagentDelegationV2Request): DelegatedSubagentExecutionParams {
 	return {
 		agent: request.agent,
 		task: request.task,
@@ -410,33 +323,13 @@ export function toSubagentDelegationV2ExecutionParams(request: SubagentDelegatio
 	};
 }
 
-export function toSubagentDelegationUpdate(requestId: string, result: PromptTemplateBridgeResult): SubagentDelegationUpdate | undefined {
-	const legacy = toDelegationUpdate(requestId, result);
-	if (!legacy) return undefined;
-	return {
-		version: SUBAGENT_DELEGATION_PROTOCOL_VERSION,
-		requestId,
-		...(legacy.runId ? { runId: legacy.runId } : {}),
-		...(legacy.currentTool ? { currentTool: legacy.currentTool } : {}),
-		...(legacy.currentToolArgs ? { currentToolArgs: legacy.currentToolArgs } : {}),
-		...(legacy.recentOutput ? { recentOutput: legacy.recentOutput } : {}),
-		...(legacy.recentOutputLines ? { recentOutputLines: legacy.recentOutputLines } : {}),
-		...(legacy.recentTools ? { recentTools: legacy.recentTools } : {}),
-		...(legacy.model ? { model: legacy.model } : {}),
-		...(typeof legacy.toolCount === "number" ? { toolCount: legacy.toolCount } : {}),
-		...(typeof legacy.durationMs === "number" ? { durationMs: legacy.durationMs } : {}),
-		...(typeof legacy.tokens === "number" ? { tokens: legacy.tokens } : {}),
-	};
-}
-
-export function toSubagentDelegationV2Update(
-	request: SubagentDelegationV2Request,
+export function toSubagentDelegationUpdate(
+	request: SubagentDelegationRequest,
 	result: PromptTemplateBridgeResult,
-): SubagentDelegationV2Update | undefined {
+): SubagentDelegationUpdate | undefined {
 	const legacy = toDelegationUpdate(request.requestId, result);
 	if (!legacy) return undefined;
 	return {
-		version: SUBAGENT_DELEGATION_V2_PROTOCOL_VERSION,
 		requestId: request.requestId,
 		ownerRunId: request.ownerRunId,
 		nodeId: request.nodeId,
@@ -464,66 +357,30 @@ function resolveSubagentDelegationStatus(
 	if (child?.structuredOutputFailed) return "structured_output_failed";
 	if (child?.turnBudgetExceeded) return "turn_budget_exhausted";
 	if (child?.toolBudgetBlocked) return "tool_budget_exhausted";
-	if (!isAgentContractV1(child.agentContract) && child?.acceptance?.status === "rejected" && child.acceptance.explicit) return "acceptance_failed";
+	if (child?.acceptance?.status === "rejected" && child.acceptance.explicit) return "acceptance_failed";
 	if (result.details?.stopped || child?.stopped || child?.interrupted) return "interrupted";
 	if (result.isError || child?.error || (typeof child?.exitCode === "number" && child.exitCode !== 0)) return "failed";
 	return "completed";
 }
 
+const MAX_RESULT_BYTES = 1024 * 1024;
+
 export function toSubagentDelegationResponse(
-	requestId: string,
+	request: SubagentDelegationRequest,
 	result: PromptTemplateBridgeResult,
 	aborted: boolean,
 ): SubagentDelegationResponse {
-	const child = result.details?.results?.[0];
-	const progress = child?.progressSummary ?? result.details?.progress?.[0];
-	const warnings = [child?.skillsWarning, child?.outputSaveError, child?.transcriptError]
-		.filter((warning): warning is string => typeof warning === "string" && warning.length > 0);
-	const status = resolveSubagentDelegationStatus(result, aborted);
-	const fallbackError = status === "failed" ? firstTextContent(result.content) : undefined;
-	return {
-		version: SUBAGENT_DELEGATION_PROTOCOL_VERSION,
-		requestId,
-		status,
-		...(child?.error || fallbackError ? { error: child?.error ?? fallbackError } : {}),
-		...(result.details?.runId ? { runId: result.details.runId } : {}),
-		...(child ? { childIndex: 0 } : {}),
-		...(child?.agent ? { agent: child.agent } : {}),
-		...(child?.model ? { model: child.model } : {}),
-		...(typeof child?.exitCode === "number" ? { exitCode: child.exitCode } : {}),
-		...(child?.execution ? { execution: child.execution as SubagentDelegationExecutionResult } : {}),
-		...(child?.finalOutput ? { output: child.finalOutput } : {}),
-		...(child?.savedOutputPath ? { outputPath: child.savedOutputPath } : {}),
-		...(child?.sessionFile ? { sessionFile: child.sessionFile } : {}),
-		...(child?.acceptance ? { acceptance: { status: child.acceptance.status, evidenceStatus: child.acceptance.evidenceStatus, explicit: child.acceptance.explicit } } : {}),
-		...(child?.review ? { review: child.review as SubagentDelegationReviewResult } : {}),
-		...(child?.effects ? { effects: child.effects as SubagentDelegationEffectsResult } : {}),
-		...(typeof child?.usage?.turns === "number" ? { turns: child.usage.turns } : {}),
-		...(typeof progress?.toolCount === "number" ? { toolCount: progress.toolCount } : {}),
-		...(typeof progress?.durationMs === "number" ? { durationMs: progress.durationMs } : {}),
-		...(typeof progress?.tokens === "number" ? { tokens: progress.tokens } : {}),
-		...(warnings.length > 0 ? { warnings } : {}),
-	};
-}
-
-const MAX_V2_RESULT_BYTES = 1024 * 1024;
-
-export function toSubagentDelegationV2Response(
-	request: SubagentDelegationV2Request,
-	result: PromptTemplateBridgeResult,
-	aborted: boolean,
-): SubagentDelegationV2Response {
 	const child = result.details?.results?.[0];
 	const progress = child?.progressSummary ?? result.details?.progress?.[0];
 	let status = resolveSubagentDelegationStatus(result, aborted);
 	let error = child?.error ?? (status === "failed" ? firstTextContent(result.content) : undefined);
-	let projectedResult: SubagentDelegationV2Value | undefined;
+	let projectedResult: SubagentDelegationValue | undefined;
 	if (status === "completed") {
 		if (request.result.kind === "text") {
 			if (typeof child?.finalOutput !== "string") {
 				status = "failed";
 				error = "Delegated subagent did not capture a text result.";
-			} else if (Buffer.byteLength(child.finalOutput, "utf8") > MAX_V2_RESULT_BYTES) {
+			} else if (Buffer.byteLength(child.finalOutput, "utf8") > MAX_RESULT_BYTES) {
 				status = "failed";
 				error = "Delegated text result exceeds 1 MiB when UTF-8 encoded.";
 			} else {
@@ -533,8 +390,8 @@ export function toSubagentDelegationV2Response(
 			status = "failed";
 			error = "Delegated subagent did not capture the requested structured result.";
 		} else {
-			const inspected = cloneJsonWithinByteLimit(child.structuredOutput, MAX_V2_RESULT_BYTES);
-			if (!inspected.ok) {
+			const inspected = cloneJsonWithinByteLimit(child.structuredOutput, MAX_RESULT_BYTES);
+			if (inspected.ok === false) {
 				status = "failed";
 				error = inspected.reason === "too_large"
 					? "Delegated structured result exceeds 1 MiB when encoded."
@@ -545,8 +402,8 @@ export function toSubagentDelegationV2Response(
 		}
 	}
 	const usage = child?.usage;
+	const childLaunchContractDigest = (child as { launchContractDigest?: string } | undefined)?.launchContractDigest;
 	return {
-		version: SUBAGENT_DELEGATION_V2_PROTOCOL_VERSION,
 		requestId: request.requestId,
 		ownerRunId: request.ownerRunId,
 		nodeId: request.nodeId,
@@ -557,7 +414,7 @@ export function toSubagentDelegationV2Response(
 		...(child?.model ? { model: child.model } : {}),
 		...(child?.thinking ? { thinking: child.thinking } : {}),
 		...(typeof child?.exitCode === "number" ? { exitCode: child.exitCode } : {}),
-		...(child?.launchContractDigest ? { launchContractDigest: child.launchContractDigest } : {}),
+		...(childLaunchContractDigest ? { launchContractDigest: childLaunchContractDigest } : {}),
 		...(projectedResult ? { result: projectedResult } : {}),
 		...(usage ? {
 			usage: {
@@ -580,28 +437,9 @@ export function toPromptTemplateResponse(
 ): PromptTemplateDelegationResponse {
 	const contentText = firstTextContent(result.content);
 	const messages = buildDelegationMessages(result.details?.results?.[0] ?? {}, contentText);
-	const parallelResults = request.tasks?.map<PromptTemplateDelegationParallelResult>((task, index) => {
-		const step = result.details?.results?.[index];
-		if (!step) {
-			return {
-				agent: task.agent,
-				messages: [],
-				isError: true,
-				errorText: "Missing result for delegated parallel task.",
-			};
-		}
-		const exitCode = typeof step.exitCode === "number" ? step.exitCode : undefined;
-		return {
-			agent: step.agent ?? task.agent,
-			messages: buildDelegationMessages(step),
-			isError: (exitCode !== undefined && exitCode !== 0) || !!step.error,
-			errorText: step.error || undefined,
-		};
-	});
 	return {
 		...request,
 		messages,
-		...(parallelResults ? { parallelResults } : {}),
 		...(contentText ? { contentText } : {}),
 		isError: result.isError === true,
 		errorText: result.isError ? contentText : undefined,

package/src/slash/delegation-request.ts

@@ -1,40 +1,15 @@
 import {
-	SUBAGENT_DELEGATION_PROTOCOL_VERSION,
-	SUBAGENT_DELEGATION_V2_PROTOCOL_VERSION,
 	type SubagentDelegationRequest,
-	type SubagentDelegationV2Request,
 } from "../api/delegation.ts";
-import { validateAcceptanceInput } from "../runs/shared/acceptance.ts";
 import { validateToolBudgetConfig } from "../runs/shared/tool-budget.ts";
 import { resolveTurnBudgetConfig } from "../runs/shared/turn-budget.ts";
 import { cloneJsonWithinByteLimit } from "./delegation-json.ts";
 
 export type SubagentDelegationParseResult =
-	| { ok: true; request: SubagentDelegationRequest | SubagentDelegationV2Request }
-	| { ok: false; version?: 1 | 2; requestId?: string; ownerRunId?: string; nodeId?: string; error: string };
+	| { ok: true; request: SubagentDelegationRequest }
+	| { ok: false; requestId?: string; ownerRunId?: string; nodeId?: string; error: string };
 
-const v1SupportedFields = new Set([
-	"version",
-	"requestId",
-	"agent",
-	"task",
-	"context",
-	"cwd",
-	"model",
-	"timeoutMs",
-	"turnBudget",
-	"toolBudget",
-	"skill",
-	"output",
-	"outputMode",
-	"outputSchema",
-	"agentContract",
-	"acceptance",
-	"artifacts",
-]);
-
-const v2SupportedFields = new Set([
-	"version",
+const supportedFields = new Set([
 	"requestId",
 	"ownerRunId",
 	"nodeId",
@@ -52,13 +27,13 @@ const v2SupportedFields = new Set([
 	"result",
 ]);
 
-const v2ThinkingLevels = new Set(["off", "minimal", "low", "medium", "high", "xhigh", "max"]);
+const thinkingLevels = new Set(["off", "minimal", "low", "medium", "high", "xhigh", "max"]);
 const MAX_SCHEMA_BYTES = 64 * 1024;
-const MAX_V2_TASK_BYTES = 1024 * 1024;
-const MAX_V2_CWD_BYTES = 32 * 1024;
-const MAX_V2_SHORT_TEXT_BYTES = 1024;
-const MAX_V2_SKILL_ENTRIES = 256;
-const MAX_V2_SKILL_AGGREGATE_BYTES = 64 * 1024;
+const MAX_TASK_BYTES = 1024 * 1024;
+const MAX_CWD_BYTES = 32 * 1024;
+const MAX_SHORT_TEXT_BYTES = 1024;
+const MAX_SKILL_ENTRIES = 256;
+const MAX_SKILL_AGGREGATE_BYTES = 64 * 1024;
 
 function nonEmptyString(value: unknown): value is string {
 	return typeof value === "string" && value.trim().length > 0;
@@ -69,10 +44,26 @@ function validateId(value: unknown): string | undefined {
 	return value;
 }
 
-function validateSharedFields(
-	value: Record<string, unknown>,
-	identity: { requestId: string; version?: 1 | 2; ownerRunId?: string; nodeId?: string },
-): SubagentDelegationParseResult | undefined {
+export function parseSubagentDelegationRequest(data: unknown): SubagentDelegationParseResult {
+	if (!data || typeof data !== "object" || Array.isArray(data)) {
+		return { ok: false, error: "Delegation request must be an object." };
+	}
+	const value = data as Record<string, unknown>;
+	const requestId = validateId(value.requestId);
+	if (!requestId) {
+		return { ok: false, error: "Delegation requestId must be a non-empty string of at most 256 characters without newlines." };
+	}
+	const ownerRunId = validateId(value.ownerRunId);
+	if (!ownerRunId) {
+		return { ok: false, requestId, error: "Delegation ownerRunId must be a non-empty string of at most 256 characters without newlines." };
+	}
+	const nodeId = validateId(value.nodeId);
+	if (!nodeId) {
+		return { ok: false, requestId, ownerRunId, error: "Delegation nodeId must be a non-empty string of at most 256 characters without newlines." };
+	}
+	const identity = { requestId, ownerRunId, nodeId };
+	const unsupportedField = Object.keys(value).find((key) => !supportedFields.has(key));
+	if (unsupportedField) return { ok: false, ...identity, error: `Unsupported delegation field: ${unsupportedField}.` };
 	if (!nonEmptyString(value.agent)) return { ok: false, ...identity, error: "Delegation agent must be a non-empty string." };
 	if (!nonEmptyString(value.task)) return { ok: false, ...identity, error: "Delegation task must be a non-empty string." };
 	if (value.context !== "fresh" && value.context !== "fork") {
@@ -85,8 +76,9 @@ function validateSharedFields(
 	if (value.timeoutMs !== undefined && (typeof value.timeoutMs !== "number" || !Number.isInteger(value.timeoutMs) || value.timeoutMs < 1)) {
 		return { ok: false, ...identity, error: "timeoutMs must be an integer >= 1." };
 	}
-	if (identity.version === SUBAGENT_DELEGATION_V2_PROTOCOL_VERSION && value.timeoutMs !== undefined && value.timeoutMs > 2_147_483_647) {
-		return { ok: false, ...identity, error: "timeoutMs must be <= 2147483647 for delegation v2." };
+	const timeoutMs = typeof value.timeoutMs === "number" ? value.timeoutMs : undefined;
+	if (timeoutMs !== undefined && timeoutMs > 2_147_483_647) {
+		return { ok: false, ...identity, error: "timeoutMs must be <= 2147483647." };
 	}
 	const turnBudget = resolveTurnBudgetConfig(value.turnBudget);
 	if (turnBudget.error) return { ok: false, ...identity, error: turnBudget.error };
@@ -96,11 +88,7 @@ function validateSharedFields(
 			return { ok: false, ...identity, error: `toolBudget.${unsupportedToolBudgetField} is not supported.` };
 		}
 	}
-	const toolBudget = validateToolBudgetConfig(
-		value.toolBudget,
-		"toolBudget",
-		identity.version === SUBAGENT_DELEGATION_V2_PROTOCOL_VERSION ? { minimumHard: 0 } : undefined,
-	);
+	const toolBudget = validateToolBudgetConfig(value.toolBudget, "toolBudget", { minimumHard: 0 });
 	if (toolBudget.error) return { ok: false, ...identity, error: toolBudget.error };
 	if (value.skill !== undefined) {
 		const validSkill = typeof value.skill === "boolean"
@@ -113,46 +101,29 @@ function validateSharedFields(
 	if (value.artifacts !== undefined && typeof value.artifacts !== "boolean") {
 		return { ok: false, ...identity, error: "artifacts must be a boolean." };
 	}
-	return undefined;
-}
-
-function parseV2(value: Record<string, unknown>, requestId: string): SubagentDelegationParseResult {
-	const ownerRunId = validateId(value.ownerRunId);
-	if (!ownerRunId) {
-		return { ok: false, version: 2, requestId, error: "Delegation ownerRunId must be a non-empty string of at most 256 characters without newlines." };
-	}
-	const nodeId = validateId(value.nodeId);
-	if (!nodeId) {
-		return { ok: false, version: 2, requestId, ownerRunId, error: "Delegation nodeId must be a non-empty string of at most 256 characters without newlines." };
-	}
-	const identity = { version: 2 as const, requestId, ownerRunId, nodeId };
-	const unsupportedField = Object.keys(value).find((key) => !v2SupportedFields.has(key));
-	if (unsupportedField) return { ok: false, ...identity, error: `Unsupported delegation field: ${unsupportedField}.` };
-	const sharedError = validateSharedFields(value, identity);
-	if (sharedError) return sharedError;
-	if (Buffer.byteLength(value.task as string, "utf8") > MAX_V2_TASK_BYTES) {
+	if (Buffer.byteLength(value.task as string, "utf8") > MAX_TASK_BYTES) {
 		return { ok: false, ...identity, error: "Delegation task exceeds 1 MiB when UTF-8 encoded." };
 	}
-	if (Buffer.byteLength(value.cwd as string, "utf8") > MAX_V2_CWD_BYTES) {
+	if (Buffer.byteLength(value.cwd as string, "utf8") > MAX_CWD_BYTES) {
 		return { ok: false, ...identity, error: "Delegation cwd exceeds 32 KiB when UTF-8 encoded." };
 	}
-	if (Buffer.byteLength(value.agent as string, "utf8") > MAX_V2_SHORT_TEXT_BYTES) {
+	if (Buffer.byteLength(value.agent as string, "utf8") > MAX_SHORT_TEXT_BYTES) {
 		return { ok: false, ...identity, error: "Delegation agent exceeds 1 KiB when UTF-8 encoded." };
 	}
-	if (typeof value.model === "string" && Buffer.byteLength(value.model, "utf8") > MAX_V2_SHORT_TEXT_BYTES) {
+	if (typeof value.model === "string" && Buffer.byteLength(value.model, "utf8") > MAX_SHORT_TEXT_BYTES) {
 		return { ok: false, ...identity, error: "Delegation model exceeds 1 KiB when UTF-8 encoded." };
 	}
 	const skillEntries = typeof value.skill === "string" ? [value.skill] : Array.isArray(value.skill) ? value.skill as string[] : [];
-	if (skillEntries.length > MAX_V2_SKILL_ENTRIES) {
+	if (skillEntries.length > MAX_SKILL_ENTRIES) {
 		return { ok: false, ...identity, error: "Delegation skill supports at most 256 entries." };
 	}
-	if (skillEntries.some((entry) => Buffer.byteLength(entry, "utf8") > MAX_V2_SHORT_TEXT_BYTES)) {
+	if (skillEntries.some((entry) => Buffer.byteLength(entry, "utf8") > MAX_SHORT_TEXT_BYTES)) {
 		return { ok: false, ...identity, error: "Delegation skill entry exceeds 1 KiB when UTF-8 encoded." };
 	}
-	if (skillEntries.reduce((total, entry) => total + Buffer.byteLength(entry, "utf8"), 0) > MAX_V2_SKILL_AGGREGATE_BYTES) {
+	if (skillEntries.reduce((total, entry) => total + Buffer.byteLength(entry, "utf8"), 0) > MAX_SKILL_AGGREGATE_BYTES) {
 		return { ok: false, ...identity, error: "Delegation skill entries exceed 64 KiB in aggregate when UTF-8 encoded." };
 	}
-	if (value.thinking !== undefined && (typeof value.thinking !== "string" || !v2ThinkingLevels.has(value.thinking))) {
+	if (value.thinking !== undefined && (typeof value.thinking !== "string" || !thinkingLevels.has(value.thinking))) {
 		return { ok: false, ...identity, error: "thinking must be one of off, minimal, low, medium, high, xhigh, or max." };
 	}
 	if (!value.result || typeof value.result !== "object" || Array.isArray(value.result)) {
@@ -170,7 +141,7 @@ function parseV2(value: Record<string, unknown>, requestId: string): SubagentDel
 			return { ok: false, ...identity, error: "result.schema must be a JSON Schema object." };
 		}
 		const inspectedSchema = cloneJsonWithinByteLimit(result.schema, MAX_SCHEMA_BYTES);
-		if (!inspectedSchema.ok) {
+		if (inspectedSchema.ok === false) {
 			return {
 				ok: false,
 				...identity,
@@ -190,60 +161,6 @@ function parseV2(value: Record<string, unknown>, requestId: string): SubagentDel
 			result: structuredSchema
 				? { kind: "structured", schema: structuredSchema }
 				: { kind: "text" },
-		} as unknown as SubagentDelegationV2Request,
+		} as unknown as SubagentDelegationRequest,
 	};
 }
-
-function parseV1(value: Record<string, unknown>, requestId: string): SubagentDelegationParseResult {
-	const unsupportedField = Object.keys(value).find((key) => !v1SupportedFields.has(key));
-	if (unsupportedField) return { ok: false, requestId, error: `Unsupported delegation field: ${unsupportedField}.` };
-	const sharedError = validateSharedFields(value, { requestId });
-	if (sharedError) return sharedError;
-	if (value.output !== undefined && typeof value.output !== "boolean" && !nonEmptyString(value.output)) {
-		return { ok: false, requestId, error: "output must be a boolean or non-empty string." };
-	}
-	if (value.outputMode !== undefined && value.outputMode !== "inline" && value.outputMode !== "file-only") {
-		return { ok: false, requestId, error: "outputMode must be inline or file-only." };
-	}
-	if (value.outputMode === "file-only" && !nonEmptyString(value.output)) {
-		return { ok: false, requestId, error: 'outputMode "file-only" requires output to be a non-empty path.' };
-	}
-	if (value.outputSchema !== undefined && (!value.outputSchema || typeof value.outputSchema !== "object" || Array.isArray(value.outputSchema))) {
-		return { ok: false, requestId, error: "outputSchema must be a JSON Schema object." };
-	}
-	if (value.agentContract !== undefined) {
-		if (!value.agentContract || typeof value.agentContract !== "object" || Array.isArray(value.agentContract)) return { ok: false, requestId, error: "agentContract must be an object." };
-		const contract = value.agentContract as Record<string, unknown>;
-		if (contract.version !== 1 || Object.keys(contract).some((key) => key !== "version")) return { ok: false, requestId, error: "agentContract must be { version: 1 }." };
-	}
-	const acceptanceErrors = validateAcceptanceInput(value.acceptance);
-	if (acceptanceErrors.length > 0) return { ok: false, requestId, error: acceptanceErrors.join(" ") };
-	return { ok: true, request: value as unknown as SubagentDelegationRequest };
-}
-
-export function parseSubagentDelegationRequest(data: unknown): SubagentDelegationParseResult {
-	if (!data || typeof data !== "object" || Array.isArray(data)) {
-		return { ok: false, error: "Delegation request must be an object." };
-	}
-	const value = data as Record<string, unknown>;
-	const requestId = validateId(value.requestId);
-	if (value.version !== SUBAGENT_DELEGATION_PROTOCOL_VERSION && value.version !== SUBAGENT_DELEGATION_V2_PROTOCOL_VERSION) {
-		return {
-			...(requestId ? { requestId } : {}),
-			ok: false,
-			error: `Unsupported delegation protocol version: ${String(value.version)}.`,
-		};
-	}
-	if (!requestId) {
-		return { ok: false, error: "Delegation requestId must be a non-empty string of at most 256 characters without newlines." };
-	}
-	if (value.version === SUBAGENT_DELEGATION_V2_PROTOCOL_VERSION) {
-		// Preserve the v1 parser's historical diagnostic for a v1-shaped payload
-		// whose version alone was changed to 2.
-		if (!Object.hasOwn(value, "ownerRunId") && !Object.hasOwn(value, "nodeId") && !Object.hasOwn(value, "result")) {
-			return { ok: false, version: 2, requestId, error: "Unsupported delegation protocol version: 2." };
-		}
-		return parseV2(value, requestId);
-	}
-	return parseV1(value, requestId);
-}