@oai404iao/pi-subagent 0.3.0 → 0.4.0

package/src/config.ts

@@ -1,17 +1,16 @@
 import { existsSync, readFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import { CONFIG_DIR_NAME, getAgentDir } from "@earendil-works/pi-coding-agent";
-import type { AgentScope, ReportDelivery, SubagentSettings } from "./types.ts";
+import type { AgentScope, RuntimeMode, SubagentSettings } from "./types.ts";
 
 export const CONFIG_FILE_NAME = "subagent.json";
 
 export const DEFAULT_SETTINGS: Readonly<SubagentSettings> = {
 	agentScope: "user",
-	syncBundledAgents: false,
 	maxDepth: 3,
-	enableRunInBackground: true,
-	defaultBackground: true,
-	reportDelivery: "wakeup",
+	runtimeMode: "background",
+	maxConcurrentBackgroundRuns: 4,
+	maxIdleRuntimes: 0,
 	inheritExtensions: false,
 	openAIIdentity: false,
 	maxOutputBytes: 50 * 1024,
@@ -20,11 +19,10 @@ export const DEFAULT_SETTINGS: Readonly<SubagentSettings> = {
 const CONFIG_KEYS = new Set([
 	"$schema",
 	"agentScope",
-	"syncBundledAgents",
 	"maxDepth",
-	"enableRunInBackground",
-	"defaultBackground",
-	"reportDelivery",
+	"runtimeMode",
+	"maxConcurrentBackgroundRuns",
+	"maxIdleRuntimes",
 	"inheritExtensions",
 	"openAIIdentity",
 	"maxOutputBytes",
@@ -81,9 +79,9 @@ function parseAgentScope(value: unknown, source: string): AgentScope {
 	throw new Error(`${source}: agentScope must be "user", "project", or "both"`);
 }
 
-function parseReportDelivery(value: unknown, source: string): ReportDelivery {
-	if (value === "wakeup" || value === "quiet") return value;
-	throw new Error(`${source}: reportDelivery must be "wakeup" or "quiet"`);
+function parseRuntimeMode(value: unknown, source: string): RuntimeMode {
+	if (value === "foreground" || value === "background") return value;
+	throw new Error(`${source}: runtimeMode must be "foreground" or "background"`);
 }
 
 function parseBoolean(value: unknown, key: string, source: string): boolean {
@@ -114,18 +112,12 @@ function applyConfig(
 	settings: SubagentSettings,
 	config: ConfigRecord,
 	source: string,
-	options: { allowSyncBundledAgents: boolean },
 ): SubagentSettings {
-	if (config.syncBundledAgents !== undefined && !options.allowSyncBundledAgents) {
-		throw new Error(`${source}: syncBundledAgents may be configured only in the user-level subagent.json`);
-	}
 	return {
 		agentScope:
-			config.agentScope === undefined ? settings.agentScope : parseAgentScope(config.agentScope, source),
-		syncBundledAgents:
-			config.syncBundledAgents === undefined
-				? settings.syncBundledAgents
-				: parseBoolean(config.syncBundledAgents, "syncBundledAgents", source),
+			config.agentScope === undefined
+				? settings.agentScope
+				: parseAgentScope(config.agentScope, source),
 		maxDepth:
 			config.maxDepth === undefined
 				? settings.maxDepth
@@ -133,18 +125,34 @@ function applyConfig(
 						minimum: 0,
 						maximum: Number.MAX_SAFE_INTEGER,
 					}),
-		enableRunInBackground:
-			config.enableRunInBackground === undefined
-				? settings.enableRunInBackground
-				: parseBoolean(config.enableRunInBackground, "enableRunInBackground", source),
-		defaultBackground:
-			config.defaultBackground === undefined
-				? settings.defaultBackground
-				: parseBoolean(config.defaultBackground, "defaultBackground", source),
-		reportDelivery:
-			config.reportDelivery === undefined
-				? settings.reportDelivery
-				: parseReportDelivery(config.reportDelivery, source),
+		runtimeMode:
+			config.runtimeMode === undefined
+				? settings.runtimeMode
+				: parseRuntimeMode(config.runtimeMode, source),
+		maxConcurrentBackgroundRuns:
+			config.maxConcurrentBackgroundRuns === undefined
+				? settings.maxConcurrentBackgroundRuns
+				: parseInteger(
+						config.maxConcurrentBackgroundRuns,
+						"maxConcurrentBackgroundRuns",
+						source,
+						{
+							minimum: 1,
+							maximum: Number.MAX_SAFE_INTEGER,
+						},
+					),
+		maxIdleRuntimes:
+			config.maxIdleRuntimes === undefined
+				? settings.maxIdleRuntimes
+				: parseInteger(
+						config.maxIdleRuntimes,
+						"maxIdleRuntimes",
+						source,
+						{
+							minimum: 0,
+							maximum: Number.MAX_SAFE_INTEGER,
+						},
+					),
 		inheritExtensions:
 			config.inheritExtensions === undefined
 				? settings.inheritExtensions
@@ -169,7 +177,7 @@ export function loadSettings(options: LoadSettingsOptions): LoadedSettings {
 	const userPath = join(options.agentDir ?? getAgentDir(), CONFIG_FILE_NAME);
 	const userConfig = readConfig(userPath);
 	if (userConfig) {
-		settings = applyConfig(settings, userConfig, userPath, { allowSyncBundledAgents: true });
+		settings = applyConfig(settings, userConfig, userPath);
 		sources.push(userPath);
 	}
 
@@ -178,7 +186,7 @@ export function loadSettings(options: LoadSettingsOptions): LoadedSettings {
 		if (projectPath) {
 			const projectConfig = readConfig(projectPath);
 			if (projectConfig) {
-				settings = applyConfig(settings, projectConfig, projectPath, { allowSyncBundledAgents: false });
+				settings = applyConfig(settings, projectConfig, projectPath);
 				sources.push(projectPath);
 			}
 		}