pi-subagents 0.17.5 → 0.18.1

package/chain-execution.ts

@@ -44,6 +44,7 @@ import {
 	type AgentProgress,
 	type ArtifactConfig,
 	type ArtifactPaths,
+	type ControlEvent,
 	type Details,
 	type ResolvedControlConfig,
 	type SingleResult,
@@ -84,12 +85,17 @@ interface ParallelChainRunInput {
 	artifactsDir: string;
 	signal?: AbortSignal;
 	onUpdate?: (r: AgentToolResult<Details>) => void;
+	onControlEvent?: (event: ControlEvent) => void;
 	controlConfig: ResolvedControlConfig;
+	childIntercomTarget?: (agent: string, index: number) => string | undefined;
 	foregroundControl?: {
 		updatedAt: number;
 		currentAgent?: string;
 		currentIndex?: number;
 		currentActivityState?: ActivityState;
+		lastActivityAt?: number;
+		currentTool?: string;
+		currentToolStartedAt?: number;
 		interrupt?: () => boolean;
 	};
 	results: SingleResult[];
@@ -200,12 +206,12 @@ async function runParallelChainTasks(input: ParallelChainRunInput): Promise<Sing
 			if (input.foregroundControl) {
 				input.foregroundControl.currentAgent = task.agent;
 				input.foregroundControl.currentIndex = input.globalTaskIndex + taskIndex;
-				input.foregroundControl.currentActivityState = "starting";
+				input.foregroundControl.currentActivityState = undefined;
 				input.foregroundControl.updatedAt = Date.now();
 				input.foregroundControl.interrupt = () => {
 					if (interruptController.signal.aborted) return false;
 					interruptController.abort();
-					input.foregroundControl!.currentActivityState = "paused";
+					input.foregroundControl!.currentActivityState = undefined;
 					input.foregroundControl!.updatedAt = Date.now();
 					return true;
 				};
@@ -225,6 +231,8 @@ async function runParallelChainTasks(input: ParallelChainRunInput): Promise<Sing
 				outputPath,
 				maxSubagentDepth,
 				controlConfig: input.controlConfig,
+				onControlEvent: input.onControlEvent,
+				intercomSessionName: input.childIntercomTarget?.(task.agent, input.globalTaskIndex + taskIndex),
 				modelOverride: effectiveModel,
 				availableModels: input.availableModels,
 				preferredModelProvider: input.ctx.model?.provider,
@@ -238,6 +246,9 @@ async function runParallelChainTasks(input: ParallelChainRunInput): Promise<Sing
 							input.foregroundControl.currentAgent = task.agent;
 							input.foregroundControl.currentIndex = input.globalTaskIndex + taskIndex;
 							input.foregroundControl.currentActivityState = current?.activityState;
+							input.foregroundControl.lastActivityAt = current?.lastActivityAt;
+							input.foregroundControl.currentTool = current?.currentTool;
+							input.foregroundControl.currentToolStartedAt = current?.currentToolStartedAt;
 							input.foregroundControl.updatedAt = Date.now();
 						}
 						input.onUpdate?.({
@@ -287,12 +298,17 @@ export interface ChainExecutionParams {
 	includeProgress?: boolean;
 	clarify?: boolean;
 	onUpdate?: (r: AgentToolResult<Details>) => void;
+	onControlEvent?: (event: ControlEvent) => void;
 	controlConfig: ResolvedControlConfig;
+	childIntercomTarget?: (agent: string, index: number) => string | undefined;
 	foregroundControl?: {
 		updatedAt: number;
 		currentAgent?: string;
 		currentIndex?: number;
 		currentActivityState?: ActivityState;
+		lastActivityAt?: number;
+		currentTool?: string;
+		currentToolStartedAt?: number;
 		interrupt?: () => boolean;
 	};
 	chainSkills?: string[];
@@ -332,7 +348,9 @@ export async function executeChain(params: ChainExecutionParams): Promise<ChainE
 		includeProgress,
 		clarify,
 		onUpdate,
+		onControlEvent,
 		controlConfig,
+		childIntercomTarget,
 		foregroundControl,
 		chainSkills: chainSkillsParam,
 		chainDir: chainDirBase,
@@ -533,6 +551,8 @@ export async function executeChain(params: ChainExecutionParams): Promise<ChainE
 					chainAgents,
 					totalSteps,
 					controlConfig,
+					onControlEvent,
+					childIntercomTarget,
 					foregroundControl,
 					worktreeSetup,
 					maxSubagentDepth: params.maxSubagentDepth,
@@ -674,12 +694,12 @@ export async function executeChain(params: ChainExecutionParams): Promise<ChainE
 			if (foregroundControl) {
 				foregroundControl.currentAgent = seqStep.agent;
 				foregroundControl.currentIndex = globalTaskIndex;
-				foregroundControl.currentActivityState = "starting";
+				foregroundControl.currentActivityState = undefined;
 				foregroundControl.updatedAt = Date.now();
 				foregroundControl.interrupt = () => {
 					if (interruptController.signal.aborted) return false;
 					interruptController.abort();
-					foregroundControl.currentActivityState = "paused";
+					foregroundControl.currentActivityState = undefined;
 					foregroundControl.updatedAt = Date.now();
 					return true;
 				};
@@ -699,6 +719,8 @@ export async function executeChain(params: ChainExecutionParams): Promise<ChainE
 				outputPath,
 				maxSubagentDepth,
 				controlConfig,
+				onControlEvent,
+				intercomSessionName: childIntercomTarget?.(seqStep.agent, globalTaskIndex),
 				modelOverride: effectiveModel,
 				availableModels,
 				preferredModelProvider: ctx.model?.provider,
@@ -712,6 +734,9 @@ export async function executeChain(params: ChainExecutionParams): Promise<ChainE
 							foregroundControl.currentAgent = seqStep.agent;
 							foregroundControl.currentIndex = globalTaskIndex;
 							foregroundControl.currentActivityState = current?.activityState;
+							foregroundControl.lastActivityAt = current?.lastActivityAt;
+							foregroundControl.currentTool = current?.currentTool;
+							foregroundControl.currentToolStartedAt = current?.currentToolStartedAt;
 							foregroundControl.updatedAt = Date.now();
 						}
 						onUpdate({

package/execution.ts

@@ -3,6 +3,7 @@
  */
 
 import { spawn } from "node:child_process";
+import { existsSync } from "node:fs";
 import type { Message } from "@mariozechner/pi-ai";
 import type { AgentConfig } from "./agents.ts";
 import {
@@ -28,8 +29,10 @@ import {
 import {
 	DEFAULT_CONTROL_CONFIG,
 	buildControlEvent,
+	claimControlNotification,
 	deriveActivityState,
 	shouldEmitControlEvent,
+	shouldNotifyControlEvent,
 } from "./subagent-control.ts";
 import {
 	getFinalOutput,
@@ -135,6 +138,7 @@ async function runSingleAttempt(
 		systemPrompt: shared.systemPrompt,
 		mcpDirectTools: agent.mcpDirectTools,
 		promptFileStem: agent.name,
+		intercomSessionName: options.intercomSessionName,
 	});
 
 	const result: SingleResult = {
@@ -150,8 +154,6 @@ async function runSingleAttempt(
 	};
 	const startTime = Date.now();
 	const controlConfig = options.controlConfig ?? DEFAULT_CONTROL_CONFIG;
-	let hasSeenActivity = false;
-	let pausedByInterrupt = false;
 	let interruptedByControl = false;
 	const allControlEvents: ControlEvent[] = [];
 	let pendingControlEvents: ControlEvent[] = [];
@@ -160,7 +162,6 @@ async function runSingleAttempt(
 		index: options.index ?? 0,
 		agent: agent.name,
 		status: "running",
-		activityState: controlConfig.enabled ? "starting" : undefined,
 		task,
 		skills: shared.resolvedSkillNames,
 		recentTools: [],
@@ -274,34 +275,39 @@ async function runSingleAttempt(
 			return events;
 		};
 
+		const emittedControlEventKeys = new Set<string>();
+		const emitControlEvent = (event: ControlEvent) => {
+			if (shouldNotifyControlEvent(controlConfig, event) && !claimControlNotification(controlConfig, event, emittedControlEventKeys)) return;
+			allControlEvents.push(event);
+			pendingControlEvents.push(event);
+			options.onControlEvent?.(event);
+		};
+
 		const updateActivityState = (now: number): boolean => {
 			const next = deriveActivityState({
 				config: controlConfig,
 				startedAt: startTime,
 				lastActivityAt: progress.lastActivityAt,
-				hasSeenActivity,
-				paused: pausedByInterrupt,
 				now,
 			});
-			if (!next || next === progress.activityState) return false;
+			if (next === progress.activityState) return false;
 			const previous = progress.activityState;
 			progress.activityState = next;
 			if (shouldEmitControlEvent(controlConfig, previous, next)) {
-				const event = buildControlEvent({
+				emitControlEvent(buildControlEvent({
 					from: previous,
 					to: next,
 					runId: options.runId,
 					agent: agent.name,
 					index: options.index,
 					ts: now,
-				});
-				allControlEvents.push(event);
-				pendingControlEvents.push(event);
-				options.onControlEvent?.(event);
+					lastActivityAt: progress.lastActivityAt,
+				}));
 			}
 			return true;
 		};
 
+
 		const emitUpdateSnapshot = (text: string) => {
 			if (!options.onUpdate || processClosed) return;
 			const progressSnapshot = snapshotProgress(progress);
@@ -338,7 +344,6 @@ async function runSingleAttempt(
 			const now = Date.now();
 			progress.durationMs = now - startTime;
 			progress.lastActivityAt = now;
-			hasSeenActivity = true;
 			updateActivityState(now);
 
 			if (evt.type === "tool_execution_start") {
@@ -481,27 +486,11 @@ async function runSingleAttempt(
 			const interrupt = () => {
 				if (processClosed || detached || settled) return;
 				interruptedByControl = true;
-				pausedByInterrupt = true;
 				progress.status = "running";
 				progress.durationMs = Date.now() - startTime;
 				result.interrupted = true;
 				result.finalOutput = "Interrupted. Waiting for explicit next action.";
-				const now = Date.now();
-				const previous = progress.activityState;
-				progress.activityState = "paused";
-				if (shouldEmitControlEvent(controlConfig, previous, "paused")) {
-					const event = buildControlEvent({
-						from: previous,
-						to: "paused",
-						runId: options.runId,
-						agent: agent.name,
-						index: options.index,
-						ts: now,
-					});
-					allControlEvents.push(event);
-					pendingControlEvents.push(event);
-					options.onControlEvent?.(event);
-				}
+				progress.activityState = undefined;
 				fireUpdate();
 				trySignalChild(proc, "SIGINT");
 				setTimeout(() => {
@@ -523,7 +512,7 @@ async function runSingleAttempt(
 		result.error = undefined;
 		result.finalOutput = result.finalOutput || "Interrupted. Waiting for explicit next action.";
 		result.controlEvents = allControlEvents.length ? allControlEvents : undefined;
-		progress.activityState = "paused";
+		progress.activityState = undefined;
 		progress.durationMs = Date.now() - startTime;
 		result.progressSummary = {
 			toolCount: progress.toolCount,
@@ -738,12 +727,11 @@ export async function runSync(
 		if (truncationResult.truncated) result.truncation = truncationResult;
 	}
 
-	if (shareEnabled) {
-		const sessionFile = options.sessionFile
-			?? (options.sessionDir ? findLatestSessionFile(options.sessionDir) : null);
-		if (sessionFile) {
-			result.sessionFile = sessionFile;
-		}
+	if (options.sessionFile && (existsSync(options.sessionFile) || result.messages?.length)) {
+		result.sessionFile = options.sessionFile;
+	} else if (shareEnabled && options.sessionDir) {
+		const sessionFile = findLatestSessionFile(options.sessionDir);
+		if (sessionFile) result.sessionFile = sessionFile;
 	}
 
 	return result;