@ryan_nookpi/pi-extension-subagent 0.5.0 → 0.5.2

package/activity.ts

@@ -7,6 +7,7 @@
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { CommandRunState } from "./types.js";
+import { getUsedContextPercent } from "./utils/format-utils.js";
 
 export const SUBAGENT_ACTIVITY_CUSTOM_TYPE = "subagent-activity";
 export const SUBAGENT_ACTIVITY_SCHEMA_VERSION = 1;
@@ -24,6 +25,7 @@ export interface ActivitySnapshot {
 	toolCallCount: number;
 	lastLine?: string;
 	contextTokens?: number;
+	contextWindow?: number;
 }
 
 export interface ActivityPayload {
@@ -36,12 +38,15 @@ export interface ActivityPayload {
 	toolCallCount: number;
 	lastLine?: string;
 	contextTokens?: number;
+	contextWindow?: number;
+	contextPercent?: number;
 }
 
 export interface ActivityThrottleState {
 	lastEmittedAt: number;
 	lastEmittedToolName?: string;
 	lastEmittedToolCallCount?: number;
+	lastEmittedContextPercent?: number;
 }
 
 export function createActivityThrottleState(): ActivityThrottleState {
@@ -69,8 +74,8 @@ export function normalizeActivityLine(text: string | undefined): string | undefi
 /**
  * Change-driven throttle policy. Returns a payload to emit, or null.
  *
- * Emits only while the run is `running`, only when `lastToolName` or
- * `toolCallCount` changed since the last emission, and at most once per
+ * Emits only while the run is `running`, when tool metadata or the displayed
+ * context percentage changes, and at most once per
  * `ACTIVITY_MIN_INTERVAL_MS` per run. A change suppressed by the interval
  * stays pending and emits on a later evaluation.
  */
@@ -84,14 +89,18 @@ export function evaluateActivityEmission(
 	// on the run state, so a positive count is required regardless of the name.
 	if (snapshot.toolCallCount <= 0) return null;
 
+	const contextPercent = getUsedContextPercent(snapshot.contextTokens, snapshot.contextWindow);
 	const changed =
-		snapshot.lastToolName !== state.lastEmittedToolName || snapshot.toolCallCount !== state.lastEmittedToolCallCount;
+		snapshot.lastToolName !== state.lastEmittedToolName ||
+		snapshot.toolCallCount !== state.lastEmittedToolCallCount ||
+		contextPercent !== state.lastEmittedContextPercent;
 	if (!changed) return null;
 	if (state.lastEmittedAt !== 0 && now - state.lastEmittedAt < ACTIVITY_MIN_INTERVAL_MS) return null;
 
 	state.lastEmittedAt = now;
 	state.lastEmittedToolName = snapshot.lastToolName;
 	state.lastEmittedToolCallCount = snapshot.toolCallCount;
+	state.lastEmittedContextPercent = contextPercent;
 
 	const payload: ActivityPayload = {
 		runId: snapshot.runId,
@@ -105,10 +114,12 @@ export function evaluateActivityEmission(
 	const lastLine = normalizeActivityLine(snapshot.lastLine);
 	if (lastLine) payload.lastLine = lastLine;
 	if (snapshot.contextTokens != null && snapshot.contextTokens > 0) payload.contextTokens = snapshot.contextTokens;
+	if (snapshot.contextWindow != null && snapshot.contextWindow > 0) payload.contextWindow = snapshot.contextWindow;
+	if (contextPercent !== undefined) payload.contextPercent = contextPercent;
 	return payload;
 }
 
-export function snapshotFromRunState(runState: CommandRunState): ActivitySnapshot {
+export function snapshotFromRunState(runState: CommandRunState, contextWindow?: number): ActivitySnapshot {
 	return {
 		status: runState.status,
 		runId: runState.id,
@@ -120,6 +131,7 @@ export function snapshotFromRunState(runState: CommandRunState): ActivitySnapsho
 		toolCallCount: runState.toolCalls,
 		lastLine: runState.lastLine,
 		contextTokens: runState.usage?.contextTokens,
+		contextWindow,
 	};
 }
 
@@ -130,11 +142,16 @@ export function snapshotFromRunState(runState: CommandRunState): ActivitySnapsho
 export function createRunActivityRecorder(
 	pi: Pick<ExtensionAPI, "appendEntry">,
 	runState: CommandRunState,
+	resolveContextWindow?: (model?: string) => number | undefined,
 ): () => void {
 	const throttleState = createActivityThrottleState();
 	return () => {
 		try {
-			const payload = evaluateActivityEmission(throttleState, snapshotFromRunState(runState), Date.now());
+			const payload = evaluateActivityEmission(
+				throttleState,
+				snapshotFromRunState(runState, resolveContextWindow?.(runState.model)),
+				Date.now(),
+			);
 			if (!payload) return;
 			pi.appendEntry(SUBAGENT_ACTIVITY_CUSTOM_TYPE, {
 				schemaVersion: SUBAGENT_ACTIVITY_SCHEMA_VERSION,

package/agents.ts

@@ -140,25 +140,30 @@ function loadAgentsFromDir(dir: string, source: "user" | "project", options: Loa
 			continue;
 		}
 
-		const { frontmatter, body } = parseFrontmatter<Record<string, string>>(content);
-		if (!frontmatter.name || !frontmatter.description) continue;
-
-		const tools = normalizeTools(frontmatter.tools, format);
-		const model = normalizeModel(frontmatter.model, format);
-		const thinking = normalizeThinkingLevel(frontmatter.thinking);
-		const runtime: AgentRuntime = frontmatter.runtime === "claude" ? "claude" : "pi";
-
-		agents.push({
-			name: frontmatter.name,
-			description: frontmatter.description,
-			tools,
-			model,
-			thinking,
-			systemPrompt: attachCommonSubagentRule(body, runtime),
-			source,
-			filePath,
-			runtime,
-		});
+		try {
+			const { frontmatter, body } = parseFrontmatter<Record<string, unknown>>(content);
+			if (typeof frontmatter.name !== "string" || typeof frontmatter.description !== "string") continue;
+			if (!frontmatter.name || !frontmatter.description) continue;
+
+			const tools = normalizeTools(frontmatter.tools, format);
+			const model = normalizeModel(typeof frontmatter.model === "string" ? frontmatter.model : undefined, format);
+			const thinking = normalizeThinkingLevel(
+				typeof frontmatter.thinking === "string" ? frontmatter.thinking : undefined,
+			);
+			const runtime: AgentRuntime = frontmatter.runtime === "claude" ? "claude" : "pi";
+
+			agents.push({
+				name: frontmatter.name,
+				description: frontmatter.description,
+				tools,
+				model,
+				thinking,
+				systemPrompt: attachCommonSubagentRule(body, runtime),
+				source,
+				filePath,
+				runtime,
+			});
+		} catch {}
 	}
 
 	return agents;

package/commands.ts

@@ -35,7 +35,14 @@ import {
 	shouldSummarizeSubagentTask,
 	summarizeSubagentDisplayTask,
 } from "./display-task.js";
-import { AGENT_NAME_PALETTE, agentBgIndex, formatUsageStats, truncateLines, truncatePlainToWidth } from "./format.js";
+import {
+	AGENT_NAME_PALETTE,
+	agentBgIndex,
+	formatUsageStats,
+	resolveContextWindow,
+	truncateLines,
+	truncatePlainToWidth,
+} from "./format.js";
 import {
 	clearPendingGroupCompletion,
 	consumePendingGroupCompletionsForSession,
@@ -1250,6 +1257,8 @@ export function registerAll(pi: ExtensionAPI, store: SubagentStore): SubagentReg
 				runState.model = undefined;
 				runState.retryCount = 0;
 				runState.lastRetryReason = undefined;
+				runState.errorClass = undefined;
+				runState.autoAbortReason = undefined;
 				runState.removed = false;
 				runState.deliveryMode = deliveryMode;
 				runState.turnCount = Math.max(DEFAULT_TURN_COUNT, runState.turnCount || DEFAULT_TURN_COUNT) + 1;
@@ -1400,7 +1409,9 @@ export function registerAll(pi: ExtensionAPI, store: SubagentStore): SubagentReg
 			}, RUN_TICK_INTERVAL_MS);
 
 			let claudeCheckpointSent = !!runState.claudeSessionId;
-			const recordActivity = hiddenFromMain ? () => {} : createRunActivityRecorder(pi, runState);
+			const recordActivity = hiddenFromMain
+				? () => {}
+				: createRunActivityRecorder(pi, runState, (model) => resolveContextWindow(ctx, model));
 			void (async () => {
 				try {
 					const { result, retryCount } = await invokeWithAutoRetry({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryan_nookpi/pi-extension-subagent",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Asynchronous subagent delegation for pi with run, batch, chain, and continuation workflows.",
   "license": "MIT",
   "repository": {

package/tool-execute.ts

@@ -1254,6 +1254,10 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 				runState.lastOutput = "";
 				runState.usage = undefined;
 				runState.model = undefined;
+				runState.retryCount = 0;
+				runState.lastRetryReason = undefined;
+				runState.errorClass = undefined;
+				runState.autoAbortReason = undefined;
 				runState.removed = false;
 				runState.turnCount = Math.max(DEFAULT_TURN_COUNT, runState.turnCount || DEFAULT_TURN_COUNT) + 1;
 				runState.contextMode = runState.contextMode ?? (config.inheritMainContext ? "main" : "sub");
@@ -1315,7 +1319,7 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 
 		function launchRunInBackground(runState: CommandRunState, taskForAgent: string): Promise<FinalizedRun> {
 			let claudeCheckpointSent = !!runState.claudeSessionId;
-			const recordActivity = createRunActivityRecorder(pi, runState);
+			const recordActivity = createRunActivityRecorder(pi, runState, (model) => resolveContextWindow(ctx, model));
 			return enqueueSubagentInvocation(() =>
 				runSingleAgent(
 					ctx.cwd,
@@ -1979,7 +1983,14 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 						pipeline.stepRunIds.push(runState.id);
 						chainLaunches.push(toLaunchSummary(runState, "chain"));
 
-						const finalized = await launchRunInBackground(runState, taskForAgent);
+						let finalized: FinalizedRun;
+						try {
+							finalized = await launchRunInBackground(runState, taskForAgent);
+						} catch (error: unknown) {
+							finalized = finalizeRunError(runState, error);
+						} finally {
+							clearRunAbortState(runState);
+						}
 						if (runState.removed) {
 							terminalStatus = finalized.isError ? "error" : "stopped";
 							pipeline.stepResults.push({

package/utils/agent-utils.ts

@@ -88,12 +88,10 @@ export const CLAUDE_MODEL_ALIAS_MAP: Record<string, string> = {
  * Normalize a comma-separated tool list according to the given format.
  * For "claude" format, maps Claude tool names to pi equivalents.
  */
-export function normalizeTools(rawTools: string | undefined, format: "pi" | "claude"): string[] | undefined {
-	if (!rawTools) return undefined;
-
-	const parsed = rawTools
-		.split(",")
-		.map((t) => t.trim())
+export function normalizeTools(rawTools: unknown, format: "pi" | "claude"): string[] | undefined {
+	const parsed = (Array.isArray(rawTools) ? rawTools : typeof rawTools === "string" ? rawTools.split(",") : [])
+		.filter((tool): tool is string => typeof tool === "string")
+		.map((tool) => tool.trim())
 		.filter(Boolean);
 
 	if (parsed.length === 0) return undefined;