pi-subagents 0.56.0 → 0.57.0

package/src/shared/types.ts

@@ -14,6 +14,7 @@ import type { AuthorityPolicyConfig } from "../policy/authority.ts";
 import type { ThinkingLevel } from "./model-info.ts";
 import type { GlobalMissionIndexRecord, MissionRecord, MissionStoreConfig } from "../missions/types.ts";
 import type { ExtensionBindings } from "../runs/shared/extension-bindings.ts";
+import type { WorkflowChildPermitContext } from "./workflow-child-permit.ts";
 
 // ============================================================================
 // Basic Types
@@ -75,6 +76,22 @@ export interface WorkflowGraphSnapshot {
 
 export type WorkflowReceiptState = "complete" | "failed" | "paused" | "stopped";
 
+export interface WorkflowChildSummaryV1 {
+	version: 1;
+	parentToolCallId: string;
+	workflowRunId: string;
+	inventoryComplete: boolean;
+	workflowState: "queued" | "running" | "completed" | "failed" | "paused" | "stopped";
+	children: Array<{
+		childId: string;
+		runId?: string;
+		agent?: string;
+		model?: string;
+		thinking?: string;
+		state: "pending" | "running" | "completed" | "failed" | "paused" | "stopped" | "rejected" | "detached";
+	}>;
+}
+
 type WorkflowReceiptEntryResumability =
 	| { latestRunId: string; resumability: { state: "resumable" } }
 	| { latestRunId?: string; resumability: { state: "not-resumable"; reason: string } };
@@ -85,6 +102,7 @@ export type WorkflowReceiptEntry = WorkflowReceiptEntryResumability & {
 	requestedContext?: "fresh" | "fork";
 	resolvedContext?: "fresh" | "fork" | "mixed";
 	outputReference?: string;
+	externalAdapter?: ExternalCliReceiptMetadata;
 	continuation: { runIds: string[] };
 };
 
@@ -94,6 +112,7 @@ export interface WorkflowReceipt {
 	state: WorkflowReceiptState;
 	createdAt: number;
 	entries: Record<string, WorkflowReceiptEntry>;
+	workflowChildren?: WorkflowChildSummaryV1;
 }
 
 export interface SavedOutputReference {
@@ -166,6 +185,10 @@ export interface TokenUsage {
 	input: number;
 	output: number;
 	total: number;
+	/** Input plus cache-read tokens for the latest assistant turn. */
+	window?: number;
+	/** Largest window observed in this usage scope. */
+	windowPeak?: number;
 }
 
 export type ActivityState = "active_long_running" | "needs_attention";
@@ -703,6 +726,8 @@ export interface AgentProgress {
 	thinking?: string;
 	inputTokens?: number;
 	outputTokens?: number;
+	window?: number;
+	windowPeak?: number;
 	durationMs: number;
 	error?: string;
 	failedTool?: string;
@@ -1044,6 +1069,8 @@ export interface SingleResult {
 	watchdog?: ChildWatchdogProgress;
 	capabilityCeiling?: ResolvedSubagentCapabilityCeiling;
 	capabilityAudit?: SubagentCapabilityAudit;
+	runner?: ExternalCliRunnerStatus | ExternalJobRunnerStatus;
+	externalProcess?: ExternalProcessStatus;
 }
 
 export interface SpawnBudgetGrant {
@@ -1090,6 +1117,7 @@ export interface WaitCompletion {
 	/** Versioned bounded output archive retained with the durable completion replay. */
 	archivePath?: string;
 	results?: WaitCompletionChild[];
+	workflowChildren?: WorkflowChildSummaryV1;
 }
 
 export interface Details {
@@ -1100,6 +1128,7 @@ export interface Details {
 	/** Run-level context summary. "mixed" when children resolved to different modes. */
 	context?: "fresh" | "fork" | "mixed";
 	results: SingleResult[];
+	workflowChildren?: WorkflowChildSummaryV1;
 	/**
 	 * Terminal completion payloads for runs this subagent_wait call observed
 	 * finishing. Async completions travel as result files that are consumed and
@@ -1375,9 +1404,11 @@ export type AgentRunnerConfig =
 	| { type: "pi" }
 	| {
 		type: "external-cli";
+		adapter?: "codex-exec" | "codex-exec-writer" | "claude-code" | "claude-code-writer" | "cursor-agent" | "cursor-agent-writer";
 		command: string;
 		args?: string[];
 		promptDelivery?: "stdin";
+		capabilities?: ExternalCliCapabilityNarrowing;
 	}
 	| {
 		type: "external-job";
@@ -1385,18 +1416,46 @@ export type AgentRunnerConfig =
 		options?: Record<string, unknown>;
 	};
 
+export type ExternalCliCapabilityNarrowing = Partial<Record<"steer" | "resume" | "structuredOutput" | "toolEvents" | "supervisor" | "forkContext" | "extensionBindings", false>>;
+
+export interface ExternalCliCapabilities {
+	stop: true;
+	steer: false;
+	resume: false;
+	structuredOutput: false;
+	toolEvents: false;
+	supervisor: "unsupported";
+	forkContext: false;
+	extensionBindings: false;
+}
+
+export interface ExternalCliReceiptMetadata {
+	adapter: { id: "external-cli" | "codex-exec" | "codex-exec-writer" | "claude-code" | "claude-code-writer" | "cursor-agent" | "cursor-agent-writer" | "grok-build"; version: 1; executionMode: "one-shot-stdin" | "one-shot-prompt-file" };
+	capabilities: ExternalCliCapabilities;
+	safety?:
+		| { sandbox: "read-only"; approvalPolicy: "never"; ephemeral: true }
+		| { access: "workspace-write"; sandbox: "workspace-write"; approvalPolicy: "never"; ephemeral: true }
+		| { permissionMode: "plan"; tools: "none"; mcp: "empty-strict"; settingSources: "none"; sessionPersistence: false }
+		| { access: "read-only"; authentication: "existing-cli-required"; permissionMode: "plan"; tools: "none"; mcp: "empty-strict"; settingSources: "user"; userSettingsTrust: "required"; sessionPersistence: false }
+		| { access: "workspace-write"; authentication: "existing-cli-required"; permissionMode: "acceptEdits"; tools: "Read,Write,Edit,Glob,Grep"; mcp: "empty-strict"; settingSources: "user"; userSettingsTrust: "required"; sessionPersistence: false }
+		| { access: "read-only"; authentication: "cursor-api-key-or-existing-login"; mode: "ask"; sandbox: "enabled"; workspaceTrust: "existing-required"; sessionReuse: false }
+		| { access: "workspace-write"; authentication: "cursor-api-key-or-existing-login"; mode: "print"; sandbox: "enabled"; workspaceTrust: "existing-required"; sessionReuse: false };
+	outputArtifacts?: { stdoutPath?: string; stderrPath?: string; finalOutputPath?: string };
+	handoff: { mode: "fresh" };
+	supervisor: { mode: "unsupported"; reason: string };
+	nonResumableReason: string;
+}
+
 export interface ExternalCliRunnerStatus {
 	type: "external-cli";
 	command: string;
 	args: string[];
-	promptDelivery: "stdin";
-	capabilities: {
-		stop: true;
-		steer: false;
-		resume: false;
-		structuredOutput: false;
-		toolEvents: false;
-	};
+	promptDelivery: "stdin" | "prompt-file";
+	adapter: ExternalCliReceiptMetadata["adapter"];
+	safety?: ExternalCliReceiptMetadata["safety"];
+	capabilities: ExternalCliCapabilities;
+	unsupportedReasons: Record<Exclude<keyof ExternalCliCapabilities, "stop">, string>;
+	nonResumableReason: string;
 }
 
 export interface ExternalJobRunnerStatus {
@@ -1443,6 +1502,11 @@ export interface ExternalProcessStatus {
 	processSignal?: string | null;
 	stdoutPath: string;
 	stderrPath: string;
+	finalOutputPath?: string;
+	stdoutBytes?: number;
+	stderrBytes?: number;
+	stdoutTruncated?: boolean;
+	stderrTruncated?: boolean;
 }
 
 export interface AsyncStatus {
@@ -1499,6 +1563,7 @@ export interface AsyncStatus {
 	capabilityCeiling?: ResolvedSubagentCapabilityCeiling;
 	capabilityAudit?: SubagentCapabilityAudit;
 	workflow?: Details["workflow"];
+	workflowChildren?: WorkflowChildSummaryV1;
 	parentWorkflowRunId?: string;
 	workflowKey?: string;
 	/** Set when a durable schedule launched this run, so completions can name their origin. */
@@ -1654,6 +1719,7 @@ export interface AsyncJobState {
 	parentWorkflowRunId?: string;
 	workflowKey?: string;
 	workflow?: Details["workflow"];
+	workflowChildren?: WorkflowChildSummaryV1;
 }
 
 export interface ForegroundResumeChild {
@@ -1671,6 +1737,8 @@ export interface ForegroundResumeChild {
 	currentPath?: string;
 	turnCount?: number;
 	tokens?: number;
+	window?: number;
+	windowPeak?: number;
 	toolCount?: number;
 	exitCode?: number;
 	error?: string;
@@ -1685,6 +1753,14 @@ export interface ForegroundResumeChild {
 	detachedReason?: string;
 	acceptance?: AcceptanceLedger;
 	agentContract?: AgentContract;
+	/** Private bounded launch fields needed to preserve the child contract on resume. */
+	resumeContract?: {
+		outputSchema?: JsonSchemaObject;
+		agentContract?: AgentContract;
+		acceptance?: AcceptanceInput;
+		output?: string | boolean;
+		outputMode?: OutputMode;
+	};
 	launchContractDigest?: string;
 	/** Private retained launch authority. Never project into status or result output. */
 	extensionBindings?: ExtensionBindings;
@@ -1723,6 +1799,8 @@ export interface ForegroundChildControl {
 	tokens?: number;
 	inputTokens?: number;
 	outputTokens?: number;
+	window?: number;
+	windowPeak?: number;
 	model?: string;
 	thinking?: string;
 	toolCount?: number;
@@ -1758,6 +1836,8 @@ export interface ForegroundRunControl {
 	tokens?: number;
 	inputTokens?: number;
 	outputTokens?: number;
+	window?: number;
+	windowPeak?: number;
 	model?: string;
 	thinking?: string;
 	toolCount?: number;
@@ -1808,6 +1888,8 @@ export interface SubagentState {
 	parentSessionFile?: string | null;
 	/** Extension-owned roots trusted for child session transcript reads. */
 	trustedSessionRoots?: string[];
+	/** Pi sessions base that caps exact runtime-recorded session file trust. */
+	trustedSessionFileRoot?: string;
 	/** Live async session roots created by this parent executor, keyed by run id. */
 	liveAsyncSessionRoots?: Map<string, string>;
 	/** Last valid parent session model observed for this session; used when continuation contexts omit ctx.model. */
@@ -1932,6 +2014,8 @@ export interface SubagentChildStatusEvent {
 // ============================================================================
 
 export interface RunSyncOptions {
+	/** Exact discovery provenance for an unknown-agent error; omission uses defensive fallback discovery. */
+	unknownAgentDiagnosticContext?: import("../agents/agents.ts").UnknownAgentDiagnosticContext;
 	/** Opt-in global permission rules; missing tools remain allowed. */
 	permissions?: import("../runs/shared/permissions.ts").PermissionConfig;
 	/** Session id of the direct parent session for permission-system ask forwarding. */
@@ -1998,6 +2082,8 @@ export interface RunSyncOptions {
 	thinkingOverride?: AgentConfig["thinking"];
 	thinkingCeiling?: ThinkingLevel;
 	extensionBindings?: ExtensionBindings;
+	/** Package-internal one-use authorization for one foreground workflow child. */
+	workflowChildPermitLaunch?: WorkflowChildPermitContext;
 	/** Registry models available for heuristic bare-model resolution */
 	availableModels?: Array<{ provider: string; id: string; fullId: string }>;
 	/** Current parent-session provider to prefer for ambiguous bare model ids */
@@ -2063,6 +2149,11 @@ export interface ScheduledRunsConfig {
 	storeRoot?: string;
 }
 
+export interface ModelExclusionsConfig {
+	/** Default duration in milliseconds. A lower configured value also shortens active cached exclusions. */
+	defaultTtlMs?: number;
+}
+
 export type FleetViewPlacement = "aboveEditor" | "belowEditor";
 
 export const FLEET_KEYBINDING_ACTIONS = [
@@ -2097,10 +2188,24 @@ export interface MainWindowRendererConfig {
 	compactResultMaxLines?: number;
 }
 
+export interface ForkContextConfig {
+	/** Keep the complete fork by default, or summarize large text-only tool results before launch. */
+	mode?: "full" | "pruned";
+	/** Required pruning model when mode is "pruned". */
+	model?: string;
+}
+
+export interface ActiveAsyncCapacityConfig {
+	/** Reclaim failed runner slots after this age when process proof is unknown; false keeps strict retention. */
+	abandonedSlotReleaseAfterMs?: number | false;
+}
+
 export interface ExtensionConfig {
 	asyncByDefault?: boolean;
 	/** Set the context for launches that omit an explicit context. */
 	defaultSubagentContext?: "fresh" | "fork";
+	/** Configure how every resolved fork session is prepared before child spawn. */
+	forkContext?: ForkContextConfig;
 	/** Optional shortcut that detaches the active foreground single-subagent run. */
 	foregroundDetachShortcut?: string;
 	/** Show the Claude Code-style navigable fleet. Defaults to true. */
@@ -2111,6 +2216,8 @@ export interface ExtensionConfig {
 	fleetKeybindings?: FleetKeybindingsConfig;
 	/** Show the under-editor async runs widget. Defaults to true, including when FleetView is enabled. */
 	asyncWidget?: boolean;
+	/** Configure the process-wide TTL policy for persisted model exclusions. */
+	modelExclusions?: ModelExclusionsConfig;
 	/** Tool description variant registered for the parent-facing subagent tool. Defaults to split metadata. */
 	toolDescriptionMode?: ToolDescriptionMode;
 	/** Inline chat rendering for the subagent tool. Defaults to rich. */
@@ -2130,6 +2237,8 @@ export interface ExtensionConfig {
 	maxSubagentSpawnsPerRun?: number;
 	/** Optional active top-level async run cap per parent session. Unset or 0 means unlimited. */
 	maxActiveAsyncRunsPerSession?: number;
+	/** Active-capacity cleanup policy. */
+	capacity?: ActiveAsyncCapacityConfig;
 	/** Global cap on simultaneously-running subagent tasks within a single run. Defaults to 20. */
 	globalConcurrencyLimit?: number;
 	/**
@@ -2285,7 +2394,7 @@ export const POLL_INTERVAL_MS = 250;
 export const WIDGET_ANIMATION_INTERVAL_MS = 1000;
 export const MAX_WIDGET_JOBS = 4;
 export const DEFAULT_SUBAGENT_MAX_DEPTH = 2;
-export const SUBAGENT_ACTIONS = ["list", "get", "models", "children.list", "guide", "create", "update", "delete", "eject", "disable", "enable", "reset", "mission.create", "mission.list", "mission.show", "mission.update", "mission.resolve-decision", "mission.attach-run", "mission.close", "worktree.discard", "refine", "refine.show", "refine.rollback", "inspector.open", "inspector.status", "inspector.close", "project.open", "project.status", "project.close", "status", "debug.run", "grant-spawn-budget", "interrupt", "resume", "steer", "stop", "dismiss", "doctor", "watchdog.status", "watchdog.check", "watchdog.configure", "watchdog.recommend-model", "schedule.create", "schedule.list", "schedule.show", "schedule.history", "schedule.pause", "schedule.resume", "schedule.run", "schedule.run-due", "schedule.delete"] as const;
+export const SUBAGENT_ACTIONS = ["list", "get", "models", "children.list", "guide", "validate", "create", "update", "delete", "eject", "disable", "enable", "reset", "mission.create", "mission.list", "mission.show", "mission.update", "mission.resolve-decision", "mission.attach-run", "mission.close", "worktree.discard", "refine", "refine.show", "refine.rollback", "inspector.open", "inspector.status", "inspector.close", "project.open", "project.status", "project.close", "status", "debug.run", "grant-spawn-budget", "interrupt", "resume", "steer", "stop", "dismiss", "doctor", "watchdog.status", "watchdog.check", "watchdog.configure", "watchdog.recommend-model", "schedule.create", "schedule.list", "schedule.show", "schedule.history", "schedule.pause", "schedule.resume", "schedule.run", "schedule.run-due", "schedule.delete"] as const;
 
 export const DEFAULT_FORK_PREAMBLE =
 	"You are a delegated subagent running from a fork of the parent session. " +

package/src/shared/workflow-child-permit.ts

@@ -0,0 +1,116 @@
+import { stableJsonDigest } from "./launch-contract.ts";
+
+export interface WorkflowChildPermitInput {
+	issuerPackage: string;
+	workflowRunId: string;
+	childKey: string;
+	agent: string;
+	launchContractDigest: string;
+	context: "fresh" | "fork";
+}
+
+export interface WorkflowChildPermitLaunch {
+	workflowRunId: string;
+	childKey: string;
+	agent: string;
+	launchContractDigest: string;
+	context: "fresh" | "fork";
+	runner: "pi";
+}
+
+export interface WorkflowChildPermitContext {
+	permit: WorkflowChildPermit;
+	workflowRunId: string;
+	childKey: string;
+}
+
+export interface WorkflowChildPermit {
+	readonly __workflowChildPermit: unique symbol;
+}
+
+interface WorkflowChildPermitRecord {
+	issuerPackage: string;
+	workflowRunId: string;
+	childKey: string;
+	agent: string;
+	expectedProjectionDigest: string;
+	state: "available" | "claimed" | "consumed";
+}
+
+const records = new WeakMap<object, WorkflowChildPermitRecord>();
+
+function projectionDigest(input: Omit<WorkflowChildPermitLaunch, "workflowRunId">): string {
+	return stableJsonDigest({
+		version: 1,
+		childKey: input.childKey,
+		agent: input.agent,
+		launchContractDigest: input.launchContractDigest,
+		context: input.context,
+		runner: input.runner,
+	});
+}
+
+function required(value: string, label: string): string {
+	if (!value.trim() || value !== value.trim()) throw new Error(`${label} must be a non-empty trimmed string.`);
+	return value;
+}
+
+/** Package-internal first-slice permit. It is opaque, in-memory, and not serializable. */
+export function createWorkflowChildPermit(input: WorkflowChildPermitInput): WorkflowChildPermit {
+	const permit = Object.freeze(Object.create(null)) as WorkflowChildPermit;
+	const record: WorkflowChildPermitRecord = {
+		issuerPackage: required(input.issuerPackage, "issuerPackage"),
+		workflowRunId: required(input.workflowRunId, "workflowRunId"),
+		childKey: required(input.childKey, "childKey"),
+		agent: required(input.agent, "agent"),
+		expectedProjectionDigest: projectionDigest({
+			childKey: input.childKey,
+			agent: input.agent,
+			launchContractDigest: required(input.launchContractDigest, "launchContractDigest"),
+			context: input.context,
+			runner: "pi",
+		}),
+		state: "available",
+	};
+	records.set(permit as object, record);
+	return permit;
+}
+
+export function validateWorkflowChildPermitRoot(permit: WorkflowChildPermit, workflowRunId: string): string | undefined {
+	const record = records.get(permit as object);
+	if (!record) return "Workflow child permit is invalid.";
+	if (record.state !== "available") return "Workflow child permit is already consumed.";
+	if (record.workflowRunId !== workflowRunId) return "Workflow child permit does not match this workflow root.";
+	return undefined;
+}
+
+/** Claim the first distinct launch attempt before validating its model-authored shape. */
+export function claimWorkflowChildPermit(permit: WorkflowChildPermit, workflowRunId: string, childKey: string): string | undefined {
+	const record = records.get(permit as object);
+	if (!record) return "Workflow child permit is invalid.";
+	if (record.state !== "available") return "Workflow child permit is already consumed.";
+	if (record.workflowRunId !== workflowRunId) return "Workflow child permit does not match this workflow root.";
+	record.state = record.childKey === childKey ? "claimed" : "consumed";
+	if (record.childKey !== childKey) return "Workflow child permit child key mismatch.";
+	return undefined;
+}
+
+/** Verify and permanently consume the permit before the one native process spawn. */
+export function consumeWorkflowChildPermit(permit: WorkflowChildPermit, launch: WorkflowChildPermitLaunch): string | undefined {
+	const record = records.get(permit as object);
+	if (!record) return "Workflow child permit is invalid.";
+	if (record.state === "available") return "Workflow child permit launch was not claimed.";
+	if (record.state === "consumed") return "Workflow child permit is already consumed.";
+	if (record.workflowRunId !== launch.workflowRunId) return "Workflow child permit does not match this workflow root.";
+	record.state = "consumed";
+	if (record.childKey !== launch.childKey) return "Workflow child permit child key mismatch.";
+	if (record.agent !== launch.agent) return "Workflow child permit agent mismatch.";
+	if (launch.runner !== "pi") return "Workflow child permit supports native Pi children only.";
+	if (record.expectedProjectionDigest !== projectionDigest(launch)) return "Workflow child permit does not match the final launch projection.";
+	return undefined;
+}
+
+export function workflowChildPermitConsumed(permit: WorkflowChildPermit): boolean {
+	const state = records.get(permit as object)?.state;
+	return state === "claimed" || state === "consumed";
+}

package/src/slash/delegation-adapters.ts

@@ -298,7 +298,6 @@ export function toSubagentDelegationExecutionParams(request: SubagentDelegationR
 		enforceHardTurnLimit: true,
 		toolBudget: request.toolBudget,
 		skill: request.skill,
-		output: false,
 		...(request.result.kind === "structured" ? { outputSchema: request.result.schema } : {}),
 		acceptance: false,
 		artifacts: request.artifacts,

package/src/slash/slash-commands.ts

@@ -3,7 +3,7 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import { keyText, type ExtensionAPI, type ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { Key, matchesKey, truncateToWidth, type Component, type KeyId, type TUI } from "@earendil-works/pi-tui";
-import { BUILTIN_AGENT_NAMES, discoverAgents, discoverAgentsAll, findBlockingAgentDiagnostic, resolveAgentName, type AgentConfig, type AgentDiscoveryDiagnostic, type AgentScope } from "../agents/agents.ts";
+import { BUILTIN_AGENT_NAMES, discoverAgents, discoverAgentsAll, findBlockingAgentDiagnostic, formatUnknownAgentError, resolveAgentName, unknownAgentDiagnosticContext, type AgentConfig, type AgentDiscoveryDiagnostic, type AgentScope, type UnknownAgentDiagnosticContext } from "../agents/agents.ts";
 import { listRuntimeAgentConfigs, mergeRuntimeAgents } from "../agents/runtime-agent-registry.ts";
 import { resolveExistingReadPaths } from "../shared/settings.ts";
 import {
@@ -22,6 +22,7 @@ import { listAsyncRuns, formatAsyncRunProgressLabel, type AsyncRunSummary } from
 import { encodeInspectReply, handleInspectRpcArgs, INSPECT_WIDGET_KEY } from "../runs/background/inspect-rpc.ts";
 import { listScheduledRunSummaries } from "../runs/background/scheduled-runs.ts";
 import { SUBAGENT_FANOUT_CHILD_ENV } from "../runs/shared/pi-args.ts";
+import { FLEET_OPEN_SHORTCUT } from "../shared/shortcuts.ts";
 import type { SlashSubagentResponse, SlashSubagentUpdate } from "./slash-bridge.ts";
 import { registerPromptWorkflowCommands } from "./prompt-workflows.ts";
 import { openSubagentsAdmin } from "./subagents-admin.ts";
@@ -108,9 +109,9 @@ const extractExecutionFlags = (rawArgs: string): { args: string; bg: boolean; fo
 	return { args, bg, fork };
 };
 
-function discoverSlashAgents(pi: ExtensionAPI, cwd: string, scope: AgentScope): { agents: AgentConfig[]; agentDiagnostics?: AgentDiscoveryDiagnostic[] } {
+function discoverSlashAgents(pi: ExtensionAPI, cwd: string, scope: AgentScope): { agents: AgentConfig[]; agentDiagnostics?: AgentDiscoveryDiagnostic[]; unknownAgentDiagnosticContext: UnknownAgentDiagnosticContext } {
 	const discovered = discoverAgents(cwd, scope);
-	if (listRuntimeAgentConfigs(pi).length === 0) return discovered;
+	if (listRuntimeAgentConfigs(pi).length === 0) return { ...discovered, unknownAgentDiagnosticContext: unknownAgentDiagnosticContext(discovered) };
 	const all = discoverAgentsAll(cwd);
 	const configuredAgents: AgentConfig[] = [
 		...all.builtin,
@@ -118,7 +119,8 @@ function discoverSlashAgents(pi: ExtensionAPI, cwd: string, scope: AgentScope):
 		...(scope !== "project" ? all.user : []),
 		...(scope !== "user" ? all.project : []),
 	];
-	return mergeRuntimeAgents(pi, discovered, configuredAgents);
+	const merged = mergeRuntimeAgents(pi, discovered, configuredAgents);
+	return { ...merged, unknownAgentDiagnosticContext: { ...unknownAgentDiagnosticContext(discovered), agents: merged.agents } };
 }
 
 const makeAgentCompletions = (pi: ExtensionAPI, state: SubagentState) => (prefix: string) => {
@@ -693,7 +695,7 @@ export function registerSlashCommands(
 				: resolvedAgent.agent;
 			const diagnostic = findBlockingAgentDiagnostic(agentName, candidates, discovered.agentDiagnostics);
 			if (diagnostic || resolvedAgent.error || !resolvedAgent.agent) {
-				ctx.ui.notify(diagnostic ? `Agent '${agentName}' has invalid configuration: ${diagnostic.error}` : resolvedAgent.error ?? `Unknown agent: ${agentName}`, "error");
+				ctx.ui.notify(diagnostic ? `Agent '${agentName}' has invalid configuration: ${diagnostic.error}` : resolvedAgent.error ?? formatUnknownAgentError(agentName, discovered.unknownAgentDiagnosticContext), "error");
 				return;
 			}
 
@@ -776,7 +778,7 @@ export function registerSlashCommands(
 		handler: async (_args, ctx) => showFleet(ctx),
 	});
 
-	pi.registerShortcut(Key.ctrlAlt("f"), {
+	pi.registerShortcut(FLEET_OPEN_SHORTCUT, {
 		description: "Open subagent fleet inspector",
 		handler: async (ctx) => showFleet(ctx),
 	});

package/src/tui/fleet-status.ts

@@ -25,6 +25,7 @@ type FleetStatusEntry = {
 	description?: string;
 	startedAt: number;
 	tokens: number;
+	window?: number;
 	state: string;
 	external?: true;
 	projectPane?: HerdrProjectPaneSnapshot;
@@ -39,6 +40,7 @@ type FleetWorkflowRow = {
 	activity?: string;
 	startedAt?: number;
 	tokens?: number;
+	window?: number;
 	overflow?: number;
 };
 
@@ -72,12 +74,15 @@ export function formatFleetElapsed(ms: number): string {
 	return `${Math.max(0, Math.round(ms / 1000))}s`;
 }
 
-export function formatFleetTokens(count: number): string {
-	let compact: string;
-	if (count >= 1_000_000) compact = `${(count / 1_000_000).toFixed(1)}M`;
-	else if (count >= 1_000) compact = `${(count / 1_000).toFixed(1)}k`;
-	else compact = `${Math.max(0, Math.round(count))}`;
-	return `↓ ${compact} tokens`;
+export function formatFleetTokens(count: number, window?: number): string {
+	const compact = (value: number): string => value >= 1_000_000
+		? `${(value / 1_000_000).toFixed(1)}M`
+		: value >= 1_000
+			? `${(value / 1_000).toFixed(1)}k`
+			: `${Math.max(0, Math.round(value))}`;
+	return window !== undefined
+		? `↓ ${compact(window)} window · ${compact(count)} spent`
+		: `↓ ${compact(count)} tokens`;
 }
 
 function rightAlign(left: string, right: string, width: number): string {
@@ -134,6 +139,7 @@ function workflowFleetRows(steps: AsyncJobStep[] | undefined): FleetWorkflowRow[
 			...(activity ? { activity } : {}),
 			...(step.startedAt !== undefined ? { startedAt: step.startedAt } : {}),
 			...(step.tokens?.total !== undefined ? { tokens: step.tokens.total } : {}),
+			...(step.tokens?.window !== undefined ? { window: step.tokens.window } : {}),
 		};
 	});
 }
@@ -332,7 +338,8 @@ export function collectFleetStatusEntries(state: SubagentState): FleetStatusEntr
 					...(modelThinking ? { modelThinking } : {}),
 					description: foregroundDescription(control, child.description),
 					startedAt: child.startedAt,
-					tokens: child.tokens ?? 0,
+				tokens: child.tokens ?? 0,
+				...(child.window !== undefined ? { window: child.window } : {}),
 					state: "running",
 					...((control.nestedChildren?.filter((nested) => nested.parentStepIndex === child.index).length ?? 0) > 0
 						? { nestedChildren: control.nestedChildren!.filter((nested) => nested.parentStepIndex === child.index) }
@@ -350,6 +357,7 @@ export function collectFleetStatusEntries(state: SubagentState): FleetStatusEntr
 			description: foregroundDescription(control, control.description),
 			startedAt: control.startedAt,
 			tokens: control.tokens ?? 0,
+			...(control.window !== undefined ? { window: control.window } : {}),
 			state: "running",
 			...(control.nestedChildren?.length ? { nestedChildren: control.nestedChildren } : {}),
 		});
@@ -367,6 +375,7 @@ export function collectFleetStatusEntries(state: SubagentState): FleetStatusEntr
 				description: latestEmit !== undefined ? `latest emit: ${latestEmit}` : job.description,
 				startedAt,
 				tokens: job.totalTokens?.total ?? 0,
+				...(job.totalTokens?.window !== undefined ? { window: job.totalTokens.window } : {}),
 				state: job.status,
 				...(job.steps?.length ? { workflowRows: workflowFleetRows(job.steps) } : {}),
 				...(job.nestedChildren?.length ? { nestedChildren: job.nestedChildren } : {}),
@@ -387,6 +396,7 @@ export function collectFleetStatusEntries(state: SubagentState): FleetStatusEntr
 				description: job.description,
 				startedAt,
 				tokens: job.totalTokens?.total ?? 0,
+				...(job.totalTokens?.window !== undefined ? { window: job.totalTokens.window } : {}),
 				state: job.status,
 				...(job.nestedChildren?.length ? { nestedChildren: job.nestedChildren } : {}),
 			});
@@ -404,6 +414,9 @@ export function collectFleetStatusEntries(state: SubagentState): FleetStatusEntr
 				description: step.description ?? job.description,
 				startedAt: step.startedAt ?? startedAt,
 				tokens: step.tokens?.total ?? (steps.length === 1 ? job.totalTokens?.total ?? 0 : 0),
+				...((step.tokens?.window ?? (steps.length === 1 ? job.totalTokens?.window : undefined)) !== undefined
+					? { window: step.tokens?.window ?? job.totalTokens?.window }
+					: {}),
 				state: step.status,
 				...((step.children?.length ?? 0) > 0
 					? { nestedChildren: step.children }
@@ -611,6 +624,10 @@ export class SubagentFleetStatus {
 			const workEntries = this.entries.filter((entry) => !entry.surface);
 			const projectEntries = this.entries.filter((entry) => entry.surface === "project-pane");
 			const tokens = workEntries.reduce((total, entry) => total + entry.tokens, 0);
+			const nativeEntries = workEntries.filter((entry) => !entry.external);
+			const window = nativeEntries.length > 0 && nativeEntries.every((entry) => entry.window !== undefined)
+				? nativeEntries.reduce((total, entry) => total + entry.window!, 0)
+				: undefined;
 			const capacity = this.state.activeAsyncCapacity;
 			const hasNativeRows = workEntries.some((entry) => !entry.external);
 			const showNativeSummary = hasNativeRows || Boolean(capacity?.used);
@@ -621,7 +638,7 @@ export class SubagentFleetStatus {
 			const paneAttention = projectEntries.filter((entry) => entry.projectPane && projectPaneNeedsAttention(entry.projectPane)).length;
 			const panes = projectEntries.length > 0 ? `${projectEntries.length} pane${projectEntries.length === 1 ? "" : "s"}${paneAttention ? ` (${paneAttention} ⚠)` : ""}` : "";
 			const label = [agents, asyncRuns, panes].filter(Boolean).join(" · ");
-			const detail = [showNativeSummary ? formatFleetTokens(tokens) : undefined, "↓/← to inspect"].filter(Boolean).join(" · ");
+			const detail = [showNativeSummary ? formatFleetTokens(tokens, window) : undefined, "↓/← to inspect"].filter(Boolean).join(" · ");
 			return [truncateToWidth(`  ${theme.fg("muted", label)}${label && detail ? " · " : ""}${theme.fg("dim", detail)}`, width)];
 		}
 		const roster = this.rosterKeys();
@@ -670,7 +687,7 @@ export class SubagentFleetStatus {
 		const elapsed = Date.now() - entry.startedAt;
 		const rightText = entry.projectPane
 			? `${entry.projectPane.summary ?? "—"} · ${formatFleetElapsed(Date.now() - entry.projectPane.refreshedAt)} ago`
-				: entry.external ? formatFleetElapsed(elapsed) : `${formatFleetElapsed(elapsed)} · ${formatFleetTokens(entry.tokens)}`;
+				: entry.external ? formatFleetElapsed(elapsed) : `${formatFleetElapsed(elapsed)} · ${formatFleetTokens(entry.tokens, entry.window)}`;
 		const right = theme.fg("dim", rightText);
 		return rightAlign(left, right, width);
 	}
@@ -695,7 +712,7 @@ export class SubagentFleetStatus {
 		const left = `${indent}${marker} ${nestedStatusGlyph(row.state, theme)} ${theme.fg("muted", `${row.name}${modelThinking}`)} · ${row.state}${activity}`;
 		const details = [
 			row.startedAt !== undefined ? formatFleetElapsed(Date.now() - row.startedAt) : undefined,
-			row.tokens !== undefined ? formatFleetTokens(row.tokens) : undefined,
+			row.tokens !== undefined ? formatFleetTokens(row.tokens, row.window) : undefined,
 		].filter(Boolean).join(" · ");
 		return truncateToWidth(`${left}${details ? theme.fg("dim", ` · ${details}`) : ""}`, width);
 	}