@ferris1225/pi-subagents 0.32.2 → 1.0.1

package/src/rpc-run.ts

@@ -14,7 +14,7 @@ import { tmpdir } from "node:os";
 import { basename, join } from "node:path";
 import { StringDecoder } from "node:string_decoder";
 import type { Message } from "@earendil-works/pi-ai";
-import type { AgentConfig, AgentSource } from "./agents.ts";
+import type { AgentConfig } from "./agents.ts";
 import type { ThinkingLevel } from "./config.ts";
 import type { IsolationMode, WorktreeFinalizationStatus } from "./worktree.ts";
 
@@ -43,7 +43,6 @@ export interface UsageStats {
 
 export interface RpcSingleResult {
 	agent: string;
-	agentSource: AgentSource | "unknown";
 	task: string;
 	exitCode: number;
 	messages: Message[];
@@ -65,16 +64,12 @@ export interface RpcSingleResult {
 	failedTools?: Array<{ toolName: string; error: string }>;
 	sessionId?: string;
 	sessionDir?: string;
-	resumed?: boolean;
 	/** Internal disposition: dispatch suppresses completion delivery for parks. */
 	parked?: boolean;
 	/** Stable logical run id assigned by dispatch (also present on queued results). */
 	runId?: number;
 	/** Filesystem isolation selected for this logical thread. */
 	isolation?: IsolationMode;
-	/** Original parent cwd; isolated children execute at isolationCwd instead. */
-	originalCwd?: string;
-	isolationCwd?: string;
 	/** Final integration state for a worktree-isolated settlement. */
 	integrationStatus?: "pending" | WorktreeFinalizationStatus;
 	integrationApplied?: boolean;
@@ -96,15 +91,6 @@ export type SubagentLiveEvent =
 	| { kind: "thinking" }
 	| { kind: "text" };
 
-/** Carries the actual streamed payload (dropped by the plain text/thinking
- * live events). Emitted in addition to the aliveness events so monitor
- * observers stay unchanged while the inspector can apply its rolling budget
- * without silently losing part of a transport delta. */
-export interface SubagentRecordEvent {
-	kind: "thinking" | "text";
-	delta: string;
-}
-
 export type RpcControlPhase =
 	| "queued"
 	| "starting"
@@ -177,10 +163,6 @@ export class RpcRunControl {
 		this.setPhase("parked");
 	}
 
-	markQueued(): void {
-		this.setPhase("queued");
-	}
-
 	markStarting(): void {
 		this.setPhase("starting");
 	}
@@ -413,15 +395,13 @@ export interface RunRpcAttemptOptions {
 	prompt: string;
 	signal?: AbortSignal;
 	onLive?: (event: SubagentLiveEvent) => void;
-	/** Receives the raw streamed deltas; observer errors are swallowed. */
-	onRecord?: (event: SubagentRecordEvent) => void;
 	env?: NodeJS.ProcessEnv;
 	control?: RpcRunControl;
 }
 
 /** Run one persistent RPC child until a stable `agent_settled` or control action. */
 export async function runRpcAgentAttempt(options: RunRpcAttemptOptions): Promise<RpcSingleResult> {
-	const { agent, agentName, task, thinkingLevel, idleTimeoutMs, signal, onLive, onRecord, control } = options;
+	const { agent, agentName, task, thinkingLevel, idleTimeoutMs, signal, onLive, control } = options;
 	const args: string[] = ["--mode", "rpc", "--exclude-tools", "subagent,subagent_control"];
 	if (options.sessionDir && options.sessionId) {
 		args.push("--session-dir", options.sessionDir);
@@ -442,12 +422,8 @@ export async function runRpcAgentAttempt(options: RunRpcAttemptOptions): Promise
 		args.push("--append-system-prompt", tmpPromptPath);
 	}
 
-	const resumed = Boolean(
-		options.sessionDir && options.sessionId && sessionExists(options.sessionDir, options.sessionId),
-	);
 	const result: RpcSingleResult = {
 		agent: agentName,
-		agentSource: agent.source,
 		task,
 		exitCode: 0,
 		messages: [],
@@ -457,7 +433,6 @@ export async function runRpcAgentAttempt(options: RunRpcAttemptOptions): Promise
 		thinking: thinkingLevel,
 		sessionId: options.sessionId,
 		sessionDir: options.sessionDir,
-		resumed,
 	};
 
 	const childDepth = currentSubagentDepth(options.env) + 1;
@@ -506,14 +481,6 @@ export async function runRpcAgentAttempt(options: RunRpcAttemptOptions): Promise
 		}
 	};
 
-	const emitRecord = (event: SubagentRecordEvent): void => {
-		try {
-			onRecord?.(event);
-		} catch {
-			/* record observers must never break protocol handling */
-		}
-	};
-
 	const setAttemptPhase = (phase: RpcControlPhase): void => {
 		if (attemptToken !== undefined) control?.updateAttemptPhase(attemptToken, phase);
 		switch (phase) {
@@ -806,12 +773,6 @@ export async function runRpcAgentAttempt(options: RunRpcAttemptOptions): Promise
 			const type = event.assistantMessageEvent?.type;
 			if (type === "thinking_delta" || type === "text_delta") {
 				emit({ kind: type === "thinking_delta" ? "thinking" : "text" });
-				const delta = event.assistantMessageEvent?.delta;
-				if (typeof delta === "string" && delta) {
-					// TranscriptBuffer owns the complete rolling-budget decision. Truncating
-					// one RPC delta here would silently lose text without setting its flag.
-					emitRecord({ kind: type === "thinking_delta" ? "thinking" : "text", delta });
-				}
 			}
 		}