@narumitw/pi-subagents 0.20.0 → 0.26.0

package/src/in-process-transport.ts

@@ -139,6 +139,7 @@ export class InProcessTransport implements SubagentTransport {
 		const final = latestAssistant(record.session.messages.slice(startingMessageCount));
 		const output = truncateUtf8(final.output || record.lastOutput, DEFAULT_MAX_OUTPUT_BYTES);
 		const truncated = output.truncated || agent.contextTruncated;
+		const policy = inProcessPolicy(agentConfig, agent);
 
 		switch (settlement.kind) {
 			case "completed":
@@ -148,21 +149,21 @@ export class InProcessTransport implements SubagentTransport {
 						exitCode: 1,
 						truncated,
 						error: final.error || "In-process subagent returned an error",
-						policy: inProcessPolicy(agentConfig),
+						policy,
 					};
 				}
 				if (final.stopReason === "aborted") {
 					return {
 						...interruptedOutcome(output.text),
 						truncated,
-						policy: inProcessPolicy(agentConfig),
+						policy,
 					};
 				}
 				return {
 					output: output.text,
 					exitCode: 0,
 					truncated,
-					policy: inProcessPolicy(agentConfig),
+					policy,
 				};
 			case "failed":
 				return {
@@ -170,7 +171,7 @@ export class InProcessTransport implements SubagentTransport {
 					exitCode: 1,
 					truncated,
 					error: errorMessage(settlement.error),
-					policy: inProcessPolicy(agentConfig),
+					policy,
 				};
 			case "timeout":
 				return {
@@ -178,13 +179,13 @@ export class InProcessTransport implements SubagentTransport {
 					exitCode: 124,
 					truncated,
 					error: `In-process subagent timed out after ${timeoutMs}ms`,
-					policy: inProcessPolicy(agentConfig),
+					policy,
 				};
 			case "aborted":
 				return {
 					...interruptedOutcome(output.text),
 					truncated,
-					policy: inProcessPolicy(agentConfig),
+					policy,
 				};
 		}
 	}
@@ -448,6 +449,7 @@ export async function resolveChildModel(options: ChildSessionCreateOptions): Pro
 	return {
 		model,
 		thinkingLevel:
+			options.agent.thinkingLevel ??
 			options.agentConfig.thinkingLevel ??
 			modelThinkingLevel ??
 			options.parentRuntime.thinkingLevel,
@@ -622,13 +624,16 @@ function interruptedOutcome(output: string): TurnOutcome {
 	return { output, exitCode: 130, aborted: true, error: "In-process subagent was aborted" };
 }
 
-function inProcessPolicy(agent: AgentConfig): NonNullable<TurnOutcome["policy"]> {
+function inProcessPolicy(
+	agentConfig: AgentConfig,
+	managedAgent: ManagedAgent,
+): NonNullable<TurnOutcome["policy"]> {
 	return {
 		inherited: ["modelRegistry", "authentication", "cwdResources"],
 		overridden: [
-			...(agent.model ? ["model"] : []),
-			...(agent.thinkingLevel ? ["thinkingLevel"] : []),
-			...(agent.tools ? ["tools"] : []),
+			...(agentConfig.model ? ["model"] : []),
+			...(managedAgent.thinkingLevel || agentConfig.thinkingLevel ? ["thinkingLevel"] : []),
+			...(agentConfig.tools ? ["tools"] : []),
 		],
 		unsupported: ["approvalPolicy", "sandboxProfile", "providerHeaders", "extensionState"],
 	};

package/src/persistence.ts

@@ -2,6 +2,7 @@ import { createHash } from "node:crypto";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { getAgentDir, withFileMutationQueue } from "@earendil-works/pi-coding-agent";
+import { isThinkingLevel } from "./agents.js";
 import { redactPrivateText } from "./context.js";
 import type { ManagedAgent } from "./registry.js";
 
@@ -165,8 +166,10 @@ function isStoredState(value: unknown): value is StoredState {
 			typeof record.updatedAt === "number" &&
 			Number.isFinite(record.updatedAt) &&
 			(record.parentId === undefined || typeof record.parentId === "string") &&
+			(record.thinkingLevel === undefined || isThinkingLevel(record.thinkingLevel)) &&
 			(record.children === undefined ||
-				(Array.isArray(record.children) && record.children.every((id) => typeof id === "string"))) &&
+				(Array.isArray(record.children) &&
+					record.children.every((id) => typeof id === "string"))) &&
 			Array.isArray(record.history) &&
 			record.history.every(isAgentTurn) &&
 			(record.mailbox === undefined ||

package/src/registry.ts

@@ -1,10 +1,7 @@
 import { randomUUID } from "node:crypto";
+import type { SubagentThinkingLevel } from "./agents.js";
 import { DEFAULT_MAX_CONTEXT_BYTES, DEFAULT_MAX_OUTPUT_BYTES, truncateUtf8 } from "./limits.js";
-import {
-	type AgentTurnRunner,
-	normalizeTransport,
-	type SubagentTransport,
-} from "./transport.js";
+import { type AgentTurnRunner, normalizeTransport, type SubagentTransport } from "./transport.js";
 
 export type AgentLifecycleState =
 	| "starting"
@@ -46,6 +43,7 @@ export interface ManagedAgent {
 	updatedAt: number;
 	cwd: string;
 	agentScope?: "user" | "project" | "both";
+	thinkingLevel?: SubagentThinkingLevel;
 	currentTask?: string;
 	history: AgentTurn[];
 	error?: string;
@@ -113,7 +111,11 @@ export class AgentRegistry {
 	private readonly agents = new Map<string, ManagedAgent>();
 	private readonly controllers = new Map<string, AbortController>();
 	private readonly running = new Map<string, Promise<ManagedAgent>>();
-	private readonly queue: Array<{ agent: ManagedAgent; task: string; resolve: (agent: ManagedAgent) => void }> = [];
+	private readonly queue: Array<{
+		agent: ManagedAgent;
+		task: string;
+		resolve: (agent: ManagedAgent) => void;
+	}> = [];
 	private changeQueue: Promise<void> = Promise.resolve();
 	private readonly maxAgents: number;
 	private readonly maxActiveTurns: number;
@@ -128,7 +130,10 @@ export class AgentRegistry {
 	private readonly transport: SubagentTransport;
 	private readonly now: () => number;
 
-	constructor(transport: SubagentTransport | AgentTurnRunner, private readonly options: AgentRegistryOptions = {}) {
+	constructor(
+		transport: SubagentTransport | AgentTurnRunner,
+		private readonly options: AgentRegistryOptions = {},
+	) {
 		this.transport = normalizeTransport(transport);
 		this.maxAgents = positiveInteger(options.maxAgents ?? 16, "maxAgents");
 		this.maxActiveTurns = positiveInteger(options.maxActiveTurns ?? 4, "maxActiveTurns");
@@ -210,6 +215,7 @@ export class AgentRegistry {
 		task: string;
 		cwd: string;
 		agentScope?: "user" | "project" | "both";
+		thinkingLevel?: SubagentThinkingLevel;
 		parentId?: string;
 		context?: string;
 		contextSourceIds?: string[];
@@ -250,6 +256,7 @@ export class AgentRegistry {
 			updatedAt: now,
 			cwd: input.cwd,
 			agentScope: input.agentScope,
+			thinkingLevel: input.thinkingLevel,
 			currentTask: task,
 			history: [],
 			mailbox: [],
@@ -293,10 +300,12 @@ export class AgentRegistry {
 			throw new Error("Subagent mailbox deduplication keys cannot exceed 256 characters");
 		}
 		const recipient = this.require(recipientId);
-		if (recipient.state === "closed") throw new Error(`Cannot message closed agent ${recipient.id}`);
+		if (recipient.state === "closed")
+			throw new Error(`Cannot message closed agent ${recipient.id}`);
 		if (senderId !== "root") {
 			const sender = this.require(senderId);
-			if (sender.state === "closed") throw new Error(`Closed agent ${sender.id} cannot send messages`);
+			if (sender.state === "closed")
+				throw new Error(`Closed agent ${sender.id} cannot send messages`);
 			if (sender.rootId !== recipient.rootId) {
 				throw new Error("Subagent mailbox messages cannot cross agent trees");
 			}
@@ -367,7 +376,8 @@ export class AgentRegistry {
 
 	async interrupt(id: string): Promise<ManagedAgent> {
 		const agent = this.require(id);
-		if (agent.state !== "running" && agent.state !== "starting") throw new Error(`Agent ${id} is not running`);
+		if (agent.state !== "running" && agent.state !== "starting")
+			throw new Error(`Agent ${id} is not running`);
 		if (agent.state === "starting") {
 			const index = this.queue.findIndex((entry) => entry.agent.id === id);
 			if (index >= 0) {
@@ -539,7 +549,11 @@ export class AgentRegistry {
 		}
 	}
 
-	private runQueuedTurn(agent: ManagedAgent, task: string, resolveQueued: (agent: ManagedAgent) => void): void {
+	private runQueuedTurn(
+		agent: ManagedAgent,
+		task: string,
+		resolveQueued: (agent: ManagedAgent) => void,
+	): void {
 		const controller = new AbortController();
 		this.controllers.set(agent.id, controller);
 		agent.state = "running";
@@ -549,7 +563,8 @@ export class AgentRegistry {
 		let completionContent = "";
 		let completionOutput = "";
 		let completionError: string | undefined;
-		void this.transport.runTurn(this.copy(agent), task, controller.signal)
+		void this.transport
+			.runTurn(this.copy(agent), task, controller.signal)
 			.then(async (outcome) => {
 				const output = truncateUtf8(outcome.output, this.maxTurnOutputBytes).text;
 				const error = outcome.error
@@ -564,7 +579,11 @@ export class AgentRegistry {
 					truncated: outcome.truncated,
 				});
 				agent.history = agent.history.slice(-this.maxHistoryTurns);
-				agent.state = outcome.aborted ? "interrupted" : outcome.exitCode === 0 ? "completed" : "failed";
+				agent.state = outcome.aborted
+					? "interrupted"
+					: outcome.exitCode === 0
+						? "completed"
+						: "failed";
 				agent.error = error;
 				agent.policy = outcome.policy;
 				completionOutput = output;
@@ -623,8 +642,7 @@ export class AgentRegistry {
 	): AgentMailboxMessage {
 		if (deduplicationKey) {
 			const existing = recipient.mailbox.find(
-				(message) =>
-					message.deduplicationKey === deduplicationKey && message.senderId === senderId,
+				(message) => message.deduplicationKey === deduplicationKey && message.senderId === senderId,
 			);
 			if (existing) return existing;
 		}

package/src/settings.ts

@@ -4,6 +4,7 @@ import * as path from "node:path";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
 import {
 	type AgentConfig,
+	type CompletionDelivery,
 	isThinkingLevel,
 	type SubagentAgentConfig,
 	type SubagentSettings,
@@ -88,6 +89,15 @@ export function normalizeSubagentSettings(value: unknown): SubagentSettings | un
 			}
 			runtime.transport = value.stateful.transport;
 		}
+		if (hasOwn(value.stateful, "completionDelivery")) {
+			if (
+				value.stateful.completionDelivery !== "next-turn" &&
+				value.stateful.completionDelivery !== "auto-resume"
+			) {
+				return undefined;
+			}
+			runtime.completionDelivery = value.stateful.completionDelivery;
+		}
 		for (const key of [
 			"maxAgents",
 			"maxActiveTurns",
@@ -121,6 +131,7 @@ export function normalizeSubagentSettings(value: unknown): SubagentSettings | un
 
 const SETTINGS_FILE = "pi-subagents.json";
 const LEGACY_SETTINGS_FILE = "pi-subagents-config.json";
+const DEFAULT_COMPLETION_DELIVERY: CompletionDelivery = "next-turn";
 let pendingSettingsNotice: string | undefined;
 
 export function readSubagentSettings(): SubagentSettings | undefined {
@@ -227,6 +238,108 @@ export function consumeSubagentSettingsNotice() {
 }
 
 export function saveSubagentConfig(settings: SubagentSettings): void {
+	writeSettingsObject(settings);
+}
+
+export interface CompletionDeliverySettingsSnapshot {
+	path: string;
+	value: CompletionDelivery;
+	source: "default" | "user settings";
+	error?: string;
+}
+
+export function subagentSettingsFilePath(): string {
+	return path.join(getAgentDir(), SETTINGS_FILE);
+}
+
+export function inspectCompletionDeliverySettings(): CompletionDeliverySettingsSnapshot {
+	const configPath = subagentSettingsFilePath();
+	if (!fs.existsSync(configPath)) {
+		return { path: configPath, value: DEFAULT_COMPLETION_DELIVERY, source: "default" };
+	}
+	try {
+		const raw = JSON.parse(fs.readFileSync(configPath, "utf8"));
+		const settings = normalizeSubagentSettings(raw);
+		if (!settings) throw new Error(`${SETTINGS_FILE} is not a valid settings object`);
+		const explicit =
+			isPlainObject(raw.stateful) && hasOwn(raw.stateful, "completionDelivery");
+		return {
+			path: configPath,
+			value: settings.stateful?.completionDelivery ?? DEFAULT_COMPLETION_DELIVERY,
+			source: explicit ? "user settings" : "default",
+		};
+	} catch (error) {
+		return {
+			path: configPath,
+			value: DEFAULT_COMPLETION_DELIVERY,
+			source: "default",
+			error: formatError(error),
+		};
+	}
+}
+
+export function updateCompletionDeliverySetting(value: CompletionDelivery): void {
+	const raw = readSettingsObjectForUpdate();
+	const stateful = raw.stateful;
+	if (stateful !== undefined && !isPlainObject(stateful)) {
+		throw new Error(`Cannot update invalid ${SETTINGS_FILE} stateful settings`);
+	}
+	writeSettingsObject({
+		...raw,
+		stateful: {
+			...(stateful ?? {}),
+			completionDelivery: value,
+		},
+	});
+}
+
+export function updateAgentToolsSetting(name: string, tools: string[] | undefined): void {
+	const raw = readSettingsObjectForUpdate();
+	const rawAgents = raw.agents;
+	if (rawAgents !== undefined && !isPlainObject(rawAgents)) {
+		throw new Error(`Cannot update invalid ${SETTINGS_FILE} agent settings`);
+	}
+	const agents = { ...(rawAgents ?? {}) };
+	const rawAgent = hasOwn(agents, name) ? agents[name] : undefined;
+	if (rawAgent !== undefined && !isPlainObject(rawAgent)) {
+		throw new Error(`Cannot update invalid ${SETTINGS_FILE} settings for ${name}`);
+	}
+	const agent = { ...(rawAgent ?? {}) };
+	if (tools === undefined) delete agent.tools;
+	else agent.tools = tools;
+	if (Object.keys(agent).length > 0) {
+		Object.defineProperty(agents, name, {
+			value: agent,
+			enumerable: true,
+			configurable: true,
+			writable: true,
+		});
+	} else {
+		delete agents[name];
+	}
+
+	const updated = { ...raw };
+	if (Object.keys(agents).length > 0) updated.agents = agents;
+	else delete updated.agents;
+	writeSettingsObject(updated);
+}
+
+function readSettingsObjectForUpdate(): Record<string, unknown> {
+	const configPath = subagentSettingsFilePath();
+	if (!fs.existsSync(configPath)) return {};
+	let parsed: unknown;
+	try {
+		parsed = JSON.parse(fs.readFileSync(configPath, "utf8"));
+	} catch (error) {
+		throw new Error(`Cannot update malformed ${SETTINGS_FILE}: ${formatError(error)}`);
+	}
+	if (!isPlainObject(parsed) || !normalizeSubagentSettings(parsed)) {
+		throw new Error(`Cannot update invalid ${SETTINGS_FILE}`);
+	}
+	return parsed;
+}
+
+function writeSettingsObject(settings: object): void {
 	const agentDir = getAgentDir();
 	fs.mkdirSync(agentDir, { recursive: true });
 	const configPath = path.join(agentDir, SETTINGS_FILE);