ultimate-pi 0.16.0 → 0.17.0

package/.pi/agents/harness/planning/hypothesis.md

@@ -63,4 +63,4 @@ Do **not** include self-evaluation scores — a separate agent handles that.
 
 ## Output
 
-Before ending, call `submit_hypothesis_brief` exactly once with the full `PlanHypothesisBrief` document. Do not paste the artifact as prose or a fenced JSON block — the tool write is the deliverable.
+Before ending, call `submit_hypothesis_brief` exactly once with the full `PlanHypothesisBrief` document. The harness writes **`artifacts/hypothesis.yaml`** (YAML on disk). Do not use bash or any `*.json` path under `artifacts/`; do not paste the artifact as prose or a fenced JSON block — the submit tool is the deliverable.

package/.pi/agents/harness/planning/implementation-researcher.md

@@ -31,7 +31,7 @@ Read `HarnessSpawnContext` plus paths to `artifacts/decomposition.yaml`, `artifa
 
 ## Output
 
-Before ending, call `submit_implementation_research` exactly once with the full document. Prose summary is optional; the artifact is the tool call.
+Before ending, call `submit_implementation_research` exactly once with the full document. The harness writes **`artifacts/implementation-research.yaml`** (YAML on disk). Do not use bash or `implementation-research.json`; prose summary is optional — the submit tool is the deliverable.
 
 
 ## Guardrails

package/.pi/extensions/harness-debate-tools.ts

@@ -192,7 +192,7 @@ export default function harnessDebateTools(pi: ExtensionAPI) {
 		name: "harness_plan_debate_eligibility",
 		label: "Plan Debate Eligibility",
 		description:
-			"Pre-debate profile selection (full|standard|light). Call after DAG pass, before harness_debate_open. Uses risk, fork, implementation/stack briefs — not R1 hypothesis output.",
+			"Pre-debate profile selection (full|standard|light|fast). Call after DAG pass, before harness_debate_open. Uses risk, fork, implementation/stack briefs — not R1 hypothesis output.",
 		parameters: Type.Object({
 			risk_level: Type.Optional(
 				Type.String({ description: "low | med | high" }),
@@ -250,6 +250,7 @@ export default function harnessDebateTools(pi: ExtensionAPI) {
 			const result = harnessPlanDebateEligibility(input);
 			const lines = [
 				`profile: ${result.profile}`,
+				`review_gate_mode: ${result.review_gate_strategy.mode}`,
 				`required_focuses: ${result.required_focuses.join(", ")}`,
 				`min_focus_rounds: ${result.min_focus_rounds}`,
 				`debate_global_cap: ${result.debate_global_cap}`,
@@ -273,7 +274,7 @@ export default function harnessDebateTools(pi: ExtensionAPI) {
 				Type.String({ description: "Optional; normalized to plan-<run_id>" }),
 			),
 			debate_profile: Type.Optional(
-				Type.String({ description: "full | standard | light" }),
+				Type.String({ description: "full | standard | light | fast" }),
 			),
 			required_focuses: Type.Optional(
 				Type.Array(
@@ -297,7 +298,8 @@ export default function harnessDebateTools(pi: ExtensionAPI) {
 			const profile =
 				p.debate_profile === "full" ||
 				p.debate_profile === "standard" ||
-				p.debate_profile === "light"
+				p.debate_profile === "light" ||
+				p.debate_profile === "fast"
 					? p.debate_profile
 					: "standard";
 			const required_focuses = (p.required_focuses ?? []).filter((f) =>
@@ -308,11 +310,14 @@ export default function harnessDebateTools(pi: ExtensionAPI) {
 				required_focuses:
 					required_focuses.length > 0 ? required_focuses : undefined,
 			});
+			const review_gate_mode =
+				profile === "fast" ? ("consolidated" as const) : ("threaded" as const);
 			await initPlanMessenger(runDir(projectRoot, runId), {
 				runId,
 				debateId,
 				debate_profile: profile,
 				required_focuses: opened.required_focuses,
+				review_gate_mode,
 			});
 			const sessionId = ctx.sessionManager.getSessionId();
 			captureHarnessEvent(sessionId, "harness_debate_round", {
@@ -325,11 +330,15 @@ export default function harnessDebateTools(pi: ExtensionAPI) {
 			const lines = [
 				`Plan debate opened: ${debateId}`,
 				`Profile: ${profile}`,
+				`Review gate mode: ${review_gate_mode}`,
 				required_focuses.length
 					? `Required focuses: ${required_focuses.join(", ")}`
 					: opened.required_focuses?.length
 						? `Required focuses: ${opened.required_focuses.join(", ")}`
 						: "Required focuses: (default all four)",
+				review_gate_mode === "consolidated"
+					? "Consolidated path: one review round (artifacts/review-round-consolidated.yaml); escalate to threaded rounds only on blockers."
+					: "Threaded path: one review round per focus (spec → wbs → schedule → quality).",
 				`Messenger: debate-messenger/ (inbox + threads/round-N/transcript.jsonl)`,
 			];
 			if (warning) lines.push(`Note: ${warning}`);

package/.pi/extensions/harness-run-context.ts

@@ -1025,6 +1025,18 @@ export default function harnessRunContext(pi: ExtensionAPI) {
 				};
 			}
 			const relForGate = pathArg.replace(/\\/g, "/");
+			if (/\.json$/i.test(relForGate) && relForGate.startsWith("artifacts/")) {
+				return {
+					content: [
+						{
+							type: "text",
+							text: `Path not allowed: ${pathArg}. Plan artifacts under artifacts/ must be .yaml (use submit_* from subagents or write_harness_yaml with YAML content).`,
+						},
+					],
+					details: { path: pathArg },
+					isError: true,
+				};
+			}
 			if (
 				isReviewRoundArtifactPath(relForGate) &&
 				!isReviewRoundYamlWriteAllowed()

package/.pi/extensions/harness-subagent-submit.ts

@@ -18,7 +18,8 @@ const MODULE_URL = import.meta.url;
 const DocumentSchema = Type.Object(
 	{
 		document: Type.Record(Type.String(), Type.Unknown(), {
-			description: "Full artifact document matching the harness JSON schema",
+			description:
+				"Plan artifact fields (validated via plan-*.schema.json, persisted as canonical YAML on disk)",
 		}),
 	},
 	{ additionalProperties: false },
@@ -58,30 +59,6 @@ export default function harnessSubagentSubmit(pi: ExtensionAPI) {
 	pi.on("tool_call", async (event) => {
 		if (!event.toolName.startsWith("submit_")) return undefined;
 		const subprocessOk = isSubprocessHarness();
-		// #region agent log
-		fetch("http://127.0.0.1:7928/ingest/a5d40896-34cb-4f12-97db-df7ada0b22f0", {
-			method: "POST",
-			headers: {
-				"Content-Type": "application/json",
-				"X-Debug-Session-Id": "2ca12b",
-			},
-			body: JSON.stringify({
-				sessionId: "2ca12b",
-				hypothesisId: "H2",
-				location: "harness-subagent-submit.ts:tool_call",
-				message: "submit tool_call gate",
-				data: {
-					toolName: event.toolName,
-					PI_HARNESS_SUBPROCESS: process.env.PI_HARNESS_SUBPROCESS,
-					HARNESS_RUN_ID: process.env.HARNESS_RUN_ID ?? null,
-					HARNESS_RUN_DIR: process.env.HARNESS_RUN_DIR ?? null,
-					HARNESS_AGENT_ID: process.env.HARNESS_AGENT_ID ?? null,
-					subprocessOk,
-				},
-				timestamp: Date.now(),
-			}),
-		}).catch(() => {});
-		// #endregion
 		if (!subprocessOk) {
 			return {
 				block: true,

package/.pi/extensions/harness-telemetry.ts

@@ -127,6 +127,7 @@ function propsFromRun(
 ): Record<string, unknown> {
 	return {
 		harness_run_id: runId,
+		run_id: runId,
 		harness_plan_id: planId,
 		harness_phase: phase,
 		pi_session_id: distinctId,
@@ -134,6 +135,28 @@ function propsFromRun(
 	};
 }
 
+function normalizedRunId(
+	data: Record<string, unknown>,
+	trace: TraceState | null,
+	distinctId: string,
+): string {
+	const fromData = [
+		data.harness_run_id,
+		data.run_id,
+		data.runId,
+		data.debate_id,
+	];
+	for (const candidate of fromData) {
+		if (typeof candidate === "string" && candidate.trim().length > 0) {
+			return candidate;
+		}
+	}
+	if (typeof trace?.run_id === "string" && trace.run_id.length > 0) {
+		return trace.run_id;
+	}
+	return distinctId;
+}
+
 function mapCustomEntry(
 	customType: string,
 	data: Record<string, unknown>,
@@ -144,11 +167,9 @@ function mapCustomEntry(
 	event: HarnessPostHogEventName;
 	properties: Record<string, unknown>;
 } | null {
-	const runId =
-		(typeof data.run_id === "string" && data.run_id) ||
-		trace?.run_id ||
-		distinctId;
+	const runId = normalizedRunId(data, trace, distinctId);
 	const planId =
+		(typeof data.harness_plan_id === "string" && data.harness_plan_id) ||
 		(typeof data.plan_id === "string" && data.plan_id) ||
 		policy?.planId ||
 		trace?.plan_id ||
@@ -185,6 +206,7 @@ function mapCustomEntry(
 				event: "harness_debate_consensus",
 				properties: {
 					...base,
+					debate_id: String(data.debate_id ?? runId),
 					consensus_id:
 						typeof data.debate_id === "string" ? data.debate_id : runId,
 					outcome: String(kind),
@@ -195,6 +217,8 @@ function mapCustomEntry(
 			event: "harness_debate_round",
 			properties: {
 				...base,
+				debate_id: String(data.debate_id ?? runId),
+				round_index: Number(data.round_index ?? data.round ?? 0),
 				round: Number(data.round_index ?? data.round ?? 0),
 				outcome: String(kind ?? "round"),
 			},
@@ -206,6 +230,7 @@ function mapCustomEntry(
 			event: "harness_debate_consensus",
 			properties: {
 				...base,
+				debate_id: String(data.debate_id ?? runId),
 				consensus_id:
 					typeof data.consensus_id === "string"
 						? data.consensus_id

package/.pi/extensions/lib/debate-bus-core.ts

@@ -25,6 +25,7 @@ import {
 } from "./debate-bus-state.js";
 import {
 	type DebateProfile,
+	PLAN_BUDGET_FAST,
 	PLAN_BUDGET_LIGHT,
 	PLAN_BUDGET_STANDARD,
 } from "./plan-debate-eligibility.js";
@@ -113,15 +114,20 @@ export function capsForDebate(
 } {
 	if (isPlanDebateId(debateId)) {
 		const active = profile ?? getDebateState()?.debate_profile ?? "standard";
-		const budget = active === "light" ? PLAN_BUDGET_LIGHT : PLAN_BUDGET;
+		const budget =
+			active === "light"
+				? PLAN_BUDGET_LIGHT
+				: active === "fast"
+					? PLAN_BUDGET_FAST
+					: PLAN_BUDGET;
 		const caps = { name: "plan" as const, ...budget };
 		if (!isHarnessBudgetEnforceOn()) {
 			return {
 				...caps,
-				max_rounds: 999,
-				max_exchanges_per_round: 99,
-				round_token_cap: caps.round_token_cap * 100,
-				debate_global_cap: caps.debate_global_cap * 100,
+				max_rounds: caps.max_rounds,
+				max_exchanges_per_round: Math.max(caps.max_exchanges_per_round, 2),
+				round_token_cap: caps.round_token_cap * 2,
+				debate_global_cap: caps.debate_global_cap * 2,
 			};
 		}
 		return caps;
@@ -135,10 +141,10 @@ export function capsForDebate(
 	if (!isHarnessBudgetEnforceOn()) {
 		return {
 			...caps,
-			max_rounds: 999,
-			max_exchanges_per_round: 99,
-			round_token_cap: caps.round_token_cap * 100,
-			debate_global_cap: caps.debate_global_cap * 100,
+			max_rounds: caps.max_rounds,
+			max_exchanges_per_round: Math.max(caps.max_exchanges_per_round, 2),
+			round_token_cap: caps.round_token_cap * 2,
+			debate_global_cap: caps.debate_global_cap * 2,
 		};
 	}
 	return caps;

package/.pi/extensions/lib/harness-subagent-auth.ts

@@ -1,23 +1,32 @@
 /**
  * Resolve concrete LLM credentials for harness subagent subprocesses.
  *
- * Parent sessions often use `router/auto` (pi-model-router). Subagents run with
+ * Parent sessions often use `router/<profile>` (pi-model-router). Subagents run with
  * `--no-extensions`, so they cannot use the logical router provider — they need
  * a real provider/model plus that provider's API key.
+ *
+ * Session-locked routing: subprocess model is chosen once from agent system prompt
+ * complexity (same analysis as parent session lock), not from per-turn parent tier.
  */
 
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
+import { resolveTierFromPrompt } from "../../../vendor/pi-model-router/extensions/routing.js";
+import type {
+	RouterProfile,
+	RouterTier,
+	RoutingRule,
+} from "../../../vendor/pi-model-router/extensions/types.js";
 import type { AgentConfig } from "../../../vendor/pi-subagents/src/agents.js";
 
 const ROUTER_SENTINEL_KEY = "pi-model-router";
 const SENTINEL_API_KEYS = new Set([ROUTER_SENTINEL_KEY, "<authenticated>"]);
 
-type RouterTier = "high" | "medium" | "low";
-
 interface ModelRouterJson {
 	defaultProfile?: string;
-	profiles?: Record<string, Partial<Record<RouterTier, { model?: string }>>>;
+	phaseBias?: number;
+	rules?: RoutingRule[];
+	profiles?: Record<string, RouterProfile>;
 }
 
 export function isUsableApiKey(key: string | undefined): key is string {
@@ -35,7 +44,33 @@ export function parseModelRef(
 	return { provider, modelId };
 }
 
-export function thinkingToRouterTier(thinking?: string): RouterTier {
+/** Planning subagents that should prefer low/medium router tier for latency. */
+const ROUTINE_PLANNING_AGENT_PATHS = new Set([
+	"harness/planning/plan-evaluator",
+	"harness/planning/plan-adversary",
+	"harness/planning/review-integrator",
+	"harness/planning/hypothesis-validator",
+	"harness/planning/sprint-contract-auditor",
+	"harness/planning/scout-structure",
+	"harness/planning/scout-semantic",
+	"harness/planning/decompose",
+	"harness/planning/hypothesis",
+	"harness/planning/stack-research",
+	"harness/planning/plan-validator",
+]);
+
+export function isRoutinePlanningAgent(agentName: string): boolean {
+	return ROUTINE_PLANNING_AGENT_PATHS.has(agentName);
+}
+
+export function thinkingToRouterTier(
+	thinking?: string,
+	agentName?: string,
+): RouterTier {
+	if (agentName && isRoutinePlanningAgent(agentName)) {
+		if (thinking === "high" || thinking === "xhigh") return "medium";
+		return "low";
+	}
 	if (thinking === "high" || thinking === "xhigh") return "high";
 	if (thinking === "off" || thinking === "minimal" || thinking === "low") {
 		return "low";
@@ -43,6 +78,64 @@ export function thinkingToRouterTier(thinking?: string): RouterTier {
 	return "medium";
 }
 
+function loadModelRouterConfig(cwd: string): ModelRouterJson | undefined {
+	const path = join(cwd, ".pi", "model-router.json");
+	if (!existsSync(path)) return undefined;
+	try {
+		return JSON.parse(readFileSync(path, "utf8")) as ModelRouterJson;
+	} catch {
+		return undefined;
+	}
+}
+
+function resolveRouterProfileEntry(
+	config: ModelRouterJson,
+	profileId: string,
+): { profileId: string; profile: RouterProfile } | undefined {
+	const profiles = config.profiles;
+	if (!profiles) return undefined;
+	const candidates = [
+		profileId,
+		config.defaultProfile ?? "auto",
+		"auto",
+		"opencode-go",
+	];
+	const seen = new Set<string>();
+	for (const id of candidates) {
+		if (!id || seen.has(id)) continue;
+		seen.add(id);
+		const profile = profiles[id];
+		if (profile?.high?.model && profile.medium?.model && profile.low?.model) {
+			return { profileId: id, profile };
+		}
+	}
+	return undefined;
+}
+
+/** Tier from agent system prompt (+ optional task line) for session model lock. */
+export function resolveSubagentRouterTier(
+	cwd: string,
+	profileId: string,
+	agent: AgentConfig,
+	taskSnippet?: string,
+): RouterTier {
+	const config = loadModelRouterConfig(cwd);
+	if (config) {
+		const entry = resolveRouterProfileEntry(config, profileId);
+		if (entry) {
+			return resolveTierFromPrompt(
+				agent.systemPrompt ?? "",
+				taskSnippet?.trim() ?? "",
+				entry.profileId,
+				entry.profile,
+				config.rules,
+				config.phaseBias ?? 0.5,
+			);
+		}
+	}
+	return thinkingToRouterTier(agent.thinking, agent.name);
+}
+
 /** Map router profile tier → concrete `provider/model` from `.pi/model-router.json`. */
 export function resolveRouterConcreteModelRef(
 	cwd: string,
@@ -51,19 +144,10 @@ export function resolveRouterConcreteModelRef(
 ): string | undefined {
 	const path = join(cwd, ".pi", "model-router.json");
 	if (!existsSync(path)) return undefined;
-	let raw: ModelRouterJson;
-	try {
-		raw = JSON.parse(readFileSync(path, "utf8")) as ModelRouterJson;
-	} catch {
-		return undefined;
-	}
-	const profiles = raw.profiles;
-	if (!profiles) return undefined;
-	const profile =
-		profiles[profileId] ??
-		profiles[raw.defaultProfile ?? "auto"] ??
-		profiles.auto;
-	const model = profile?.[tier]?.model;
+	const raw = loadModelRouterConfig(cwd);
+	if (!raw) return undefined;
+	const entry = resolveRouterProfileEntry(raw, profileId);
+	const model = entry?.profile[tier]?.model;
 	return typeof model === "string" && model.includes("/") ? model : undefined;
 }
 
@@ -83,6 +167,7 @@ export function resolveConcreteSubagentModel(
 	cwd: string,
 	parentModel: { provider: string; id: string } | undefined,
 	agent: AgentConfig,
+	taskSnippet?: string,
 ): ConcreteSubagentModel | undefined {
 	if (agent.model && !agent.model.startsWith("router/")) {
 		const parsed = parseModelRef(agent.model);
@@ -109,7 +194,7 @@ export function resolveConcreteSubagentModel(
 		agentIsRouter && agent.model
 			? agent.model.slice("router/".length)
 			: (parentModel?.id ?? "auto");
-	const tier = thinkingToRouterTier(agent.thinking);
+	const tier = resolveSubagentRouterTier(cwd, profileId, agent, taskSnippet);
 	const concrete = resolveRouterConcreteModelRef(cwd, profileId, tier);
 	if (!concrete) return undefined;
 	const parsed = parseModelRef(concrete);

package/.pi/extensions/lib/harness-subagent-policy.ts

@@ -24,6 +24,9 @@ export type HarnessAgentKind =
 
 const MUTATING_TOOLS = new Set(["write", "edit"]);
 
+/** Planning agents must use submit_* → canonical artifacts/*.yaml, not JSON dumps. */
+const PLANNING_ARTIFACT_JSON_WRITE = /artifacts\/[^\s'"`;]+\.json\b/i;
+
 const PLANNING_BASH_DENY_PATTERNS = [
 	/\bgraphify\s+update\b/i,
 	/\bgraphify\s+extract\b/i,
@@ -174,6 +177,17 @@ export function evaluateHarnessSubagentToolCall(
 
 	if (toolName === "bash") {
 		const command = String(input?.command ?? "");
+		if (
+			kind === "planner" &&
+			command &&
+			PLANNING_ARTIFACT_JSON_WRITE.test(command)
+		) {
+			return {
+				action: "block",
+				reason:
+					"harness-subagent-policy: artifacts must be YAML only — use submit_* (e.g. submit_hypothesis_brief → artifacts/hypothesis.yaml), not bash writes to .json.",
+			};
+		}
 		if (command && isMutatingBash(command)) {
 			return {
 				action: "block",

package/.pi/extensions/lib/harness-subagents-bridge.ts

@@ -13,6 +13,11 @@ import {
 	type HarnessSubagentsOptions,
 	type SpawnAuthForward,
 } from "../../../vendor/pi-subagents/src/subagents.js";
+import {
+	getLatestRunContext,
+	getRunIdFromSession,
+	type HarnessPhase,
+} from "../../lib/harness-run-context.js";
 import { parseSpawnContextFromTask } from "../../lib/harness-spawn-parse.js";
 import { harnessSubagentSubmitExtensionPath } from "../harness-subagent-submit.js";
 import { refreshHarnessCocoindexIndex } from "./harness-cocoindex-refresh.js";
@@ -35,6 +40,51 @@ import {
 
 const spawnBudget = createSpawnBudgetState();
 let lastSessionId = "harness";
+let spawnGroupCounter = 0;
+type PendingSpawnTelemetry = {
+	harness_run_id: string;
+	run_id: string;
+	harness_plan_id: string;
+	harness_phase: HarnessPhase;
+	agent_ids: string[];
+	spawn_group_id: string;
+};
+let pendingSpawnTelemetry: PendingSpawnTelemetry | null = null;
+
+function collectHarnessAgentIds(params: Record<string, unknown>): string[] {
+	const out = new Set<string>();
+	const maybe = params as {
+		agent?: string;
+		chain?: Array<{ agent?: string }>;
+		tasks?: Array<{ agent?: string }>;
+		aggregator?: { agent?: string };
+	};
+	if (typeof maybe.agent === "string" && maybe.agent.startsWith("harness/")) {
+		out.add(maybe.agent);
+	}
+	for (const item of maybe.chain ?? []) {
+		if (typeof item?.agent === "string" && item.agent.startsWith("harness/")) {
+			out.add(item.agent);
+		}
+	}
+	for (const item of maybe.tasks ?? []) {
+		if (typeof item?.agent === "string" && item.agent.startsWith("harness/")) {
+			out.add(item.agent);
+		}
+	}
+	if (
+		typeof maybe.aggregator?.agent === "string" &&
+		maybe.aggregator.agent.startsWith("harness/")
+	) {
+		out.add(maybe.aggregator.agent);
+	}
+	return Array.from(out.values()).sort();
+}
+
+function nextSpawnGroupId(sessionId: string): string {
+	spawnGroupCounter += 1;
+	return `${sessionId}-${Date.now()}-${spawnGroupCounter}`;
+}
 
 async function resolveHarnessSpawnAuth(
 	ctx: ExtensionContext,
@@ -111,11 +161,13 @@ export function createHarnessSubagentsExtension(
 			const { harnessCount } = countHarnessAgentsInRequest(
 				params as Parameters<typeof countHarnessAgentsInRequest>[0],
 			);
+			pendingSpawnTelemetry = null;
 			if (harnessCount > 0) {
 				const budget = checkHarnessSpawnBudget(spawnBudget, harnessCount);
 				if (!budget.ok) {
 					return { ok: false, message: budget.message };
 				}
+				const entries = ctx.sessionManager.getEntries();
 				const phase = inferPhaseForPrecheck(ctx.sessionManager.getEntries());
 				const pre = precheckHarnessSubagentSpawn(
 					params as Parameters<typeof precheckHarnessSubagentSpawn>[0],
@@ -133,6 +185,19 @@ export function createHarnessSubagentsExtension(
 						return { ok: false, message: refreshMsg };
 					}
 				}
+				const runCtx = getLatestRunContext(entries);
+				const runId =
+					runCtx?.run_id ??
+					getRunIdFromSession(entries, lastSessionId) ??
+					lastSessionId;
+				pendingSpawnTelemetry = {
+					harness_run_id: runId,
+					run_id: runId,
+					harness_plan_id: runCtx?.plan_id ?? "plan-unknown",
+					harness_phase: phase,
+					agent_ids: collectHarnessAgentIds(params as Record<string, unknown>),
+					spawn_group_id: nextSpawnGroupId(lastSessionId),
+				};
 			}
 			return { ok: true };
 		},
@@ -142,6 +207,16 @@ export function createHarnessSubagentsExtension(
 			captureHarnessEvent(lastSessionId, "harness_subagent_spawned", {
 				active_after: spawnBudget.active,
 				spawn_count: harnessCount,
+				harness_run_id: pendingSpawnTelemetry?.harness_run_id ?? lastSessionId,
+				run_id: pendingSpawnTelemetry?.run_id ?? lastSessionId,
+				harness_plan_id:
+					pendingSpawnTelemetry?.harness_plan_id ?? "plan-unknown",
+				harness_phase: pendingSpawnTelemetry?.harness_phase ?? "plan",
+				agent_ids: pendingSpawnTelemetry?.agent_ids ?? [],
+				agent_count: pendingSpawnTelemetry?.agent_ids.length ?? harnessCount,
+				spawn_group_id:
+					pendingSpawnTelemetry?.spawn_group_id ??
+					nextSpawnGroupId(lastSessionId),
 			});
 		},
 		onSpawnEnd: (harnessCount) => {
@@ -154,7 +229,17 @@ export function createHarnessSubagentsExtension(
 				mode,
 				duration_ms: durationMs,
 				agent_count: agents.length,
+				agent_ids: agents,
+				harness_run_id: pendingSpawnTelemetry?.harness_run_id ?? lastSessionId,
+				run_id: pendingSpawnTelemetry?.run_id ?? lastSessionId,
+				harness_plan_id:
+					pendingSpawnTelemetry?.harness_plan_id ?? "plan-unknown",
+				harness_phase: pendingSpawnTelemetry?.harness_phase ?? "plan",
+				spawn_group_id:
+					pendingSpawnTelemetry?.spawn_group_id ??
+					nextSpawnGroupId(lastSessionId),
 			});
+			pendingSpawnTelemetry = null;
 		},
 	};