@pi-ohm/subagents 0.6.4-dev.25620170147.1.0b6891f → 0.6.4-dev.25632661332.1.3bf351f

package/dist/agent-controller.d.ts

@@ -1,5 +1,7 @@
 import { AgentToolResult, ExtensionAPI, ToolDefinition } from "@earendil-works/pi-coding-agent";
-import { Static, Type } from "@earendil-works/pi-ai";
+import { Api, Model, Static, Type } from "@earendil-works/pi-ai";
+import { Result } from "better-result";
+import { ThinkingLevel } from "@earendil-works/pi-agent-core";
 
 //#region src/agent-controller.d.ts
 declare const SpawnAgentArgsSchema: Type.TObject<{
@@ -41,8 +43,17 @@ type CloseAgentArgs = Static<typeof CloseAgentArgsSchema>;
 type ResumeAgentArgs = Static<typeof ResumeAgentArgsSchema>;
 type GetAgentResultArgs = Static<typeof GetAgentResultArgsSchema>;
 type ListAgentsArgs = Static<typeof ListAgentsArgsSchema>;
-declare function registerAgentControllerTool(pi: Pick<ExtensionAPI, "registerTool" | "appendEntry" | "on">): void;
-declare function createSubagentToolRuntime(pi: Pick<ExtensionAPI, "appendEntry">): SubagentToolRuntime;
+interface ResolvedSpawnConfig {
+  readonly agentType: string;
+  readonly model: Model<Api>;
+  readonly modelKey: string;
+  readonly agentDir: string;
+  readonly thinking: ThinkingLevel;
+  readonly tools?: readonly string[];
+  readonly prompt: string;
+}
+declare function registerAgentControllerTool(pi: Pick<ExtensionAPI, "registerTool" | "appendEntry" | "getThinkingLevel" | "on">): void;
+declare function createSubagentToolRuntime(pi: Pick<ExtensionAPI, "appendEntry" | "getThinkingLevel">): SubagentToolRuntime;
 interface SubagentToolRuntime {
   spawn(params: SpawnAgentArgs, ctx: ToolContext): Promise<AgentToolResult<unknown>>;
   send(params: SendAgentInputArgs, ctx: ToolContext): Promise<AgentToolResult<unknown>>;
@@ -55,5 +66,11 @@ interface SubagentToolRuntime {
 }
 type ToolContext = Parameters<ToolDefinition["execute"]>[4];
 declare function createSubagentTools(runtime: SubagentToolRuntime): readonly ToolDefinition[];
+declare function resolveSpawnConfig(input: {
+  readonly cwd: string;
+  readonly params: SpawnAgentArgs;
+  readonly currentModel?: Model<Api>;
+  readonly currentThinking?: ThinkingLevel;
+}): Promise<Result<ResolvedSpawnConfig, Error>>;
 //#endregion
-export { SubagentToolRuntime, createSubagentToolRuntime, createSubagentTools, registerAgentControllerTool };
+export { SubagentToolRuntime, createSubagentToolRuntime, createSubagentTools, registerAgentControllerTool, resolveSpawnConfig };

package/dist/agent-controller.js

@@ -1,7 +1,10 @@
-import { defineTool } from "@earendil-works/pi-coding-agent";
+import { isSubagentRuntimeConfig, resolveSubagentProfileRuntimeConfig, subagentsConfigModule } from "./config.js";
+import { AuthStorage, ModelRegistry, defineTool } from "@earendil-works/pi-coding-agent";
+import path from "node:path";
 import { Type, getModels, getProviders } from "@earendil-works/pi-ai";
 import { Result } from "better-result";
 import { PipController, createSdkPipRunner } from "@pi-ohm/core/pip";
+import { loadConfig, pickConfig, resolveExtensionConfigDir } from "@pi-ohm/core/config";
 
 //#region src/agent-controller.ts
 const defaultModel = "openai-codex/gpt-5.4-mini:medium";
@@ -54,11 +57,18 @@ function createSubagentToolRuntime(pi) {
 		async spawn(params, ctx) {
 			const parentSessionId = ctx.sessionManager.getSessionId();
 			const record = getRecord(controllers, parentSessionId);
-			const key = controllerKey(params);
+			const config = await resolveSpawnConfig({
+				cwd: ctx.cwd,
+				params,
+				currentModel: ctx.model,
+				currentThinking: pi.getThinkingLevel()
+			});
+			if (Result.isError(config)) return toolError(config.error.message);
+			const key = controllerKey(config.value);
 			const currentController = record.controllers.get(key);
 			const created = currentController ? Result.ok(currentController) : createPipController({
 				pi,
-				params
+				config: config.value
 			});
 			if (Result.isError(created)) return toolError(created.error.message);
 			const controller = created.value;
@@ -66,10 +76,10 @@ function createSubagentToolRuntime(pi) {
 			if (ctx.hasUI) ctx.ui.notify(`subagent spawned: ${params.task_name}`, "info");
 			const spawned = await controller.spawn({
 				ownerPackage: "@pi-ohm/subagents",
-				role: params.agent_type ?? "default",
+				role: config.value.agentType,
 				parentSessionId,
 				cwd: ctx.cwd,
-				prompt: params.prompt,
+				prompt: config.value.prompt,
 				runInBackground: params.run_in_background ?? true,
 				parentSessionFile: params.fork_context ? ctx.sessionManager.getSessionFile() : undefined
 			});
@@ -250,16 +260,12 @@ function createControllerRecord() {
 	};
 }
 function createPipController(input) {
-	const modelSpec = Result.try({
-		try: () => parseModelSpec(input.params.model),
-		catch: (cause) => cause instanceof Error ? cause : new Error(String(cause))
-	});
-	if (Result.isError(modelSpec)) return Result.err(modelSpec.error);
-	const thinkingLevel = input.params.thinking ?? modelSpec.value.thinkingLevel;
 	return Result.ok(new PipController({
 		runner: createSdkPipRunner({
-			model: modelSpec.value.model,
-			thinkingLevel
+			model: input.config.model,
+			agentDir: input.config.agentDir,
+			thinkingLevel: input.config.thinking,
+			tools: input.config.tools
 		}),
 		entries: { write(entry) {
 			input.pi.appendEntry("pi-ohm.pip", entry);
@@ -267,8 +273,70 @@ function createPipController(input) {
 		} }
 	}));
 }
-function controllerKey(params) {
-	return `${params.model ?? defaultModel}:${params.thinking ?? "default"}`;
+function controllerKey(config) {
+	return `${config.modelKey}:${config.thinking}:${config.tools?.join(",") ?? "default"}`;
+}
+async function resolveSpawnConfig(input) {
+	const loaded = await loadConfig({
+		cwd: input.cwd,
+		modules: [subagentsConfigModule]
+	});
+	if (Result.isError(loaded)) return Result.err(loaded.error);
+	const subagents = pickConfig({
+		loaded: loaded.value,
+		module: subagentsConfigModule,
+		is: isSubagentRuntimeConfig
+	});
+	if (Result.isError(subagents)) return Result.err(subagents.error);
+	const agentType = input.params.agent_type?.trim() || input.params.task_name.trim();
+	const currentModelPattern = input.currentModel ? modelKey(input.currentModel) : undefined;
+	const baseProfile = resolveSubagentProfileRuntimeConfig({
+		config: { subagents: subagents.value },
+		subagentId: agentType,
+		modelPattern: input.params.model ?? currentModelPattern
+	});
+	const profile = resolveSubagentProfileRuntimeConfig({
+		config: { subagents: subagents.value },
+		subagentId: agentType,
+		modelPattern: input.params.model ?? baseProfile?.model ?? currentModelPattern
+	});
+	const agentDir = resolveExtensionConfigDir();
+	const modelSpec = Result.try({
+		try: () => parseModelSpec({
+			agentDir,
+			spec: input.params.model ?? profile?.model,
+			currentModel: input.currentModel
+		}),
+		catch: (cause) => cause instanceof Error ? cause : new Error(String(cause))
+	});
+	if (Result.isError(modelSpec)) return Result.err(modelSpec.error);
+	const thinking = input.params.thinking ?? profile?.thinking ?? (input.params.model || profile?.model ? modelSpec.value.thinkingLevel : input.currentThinking) ?? modelSpec.value.thinkingLevel;
+	return Result.ok({
+		agentType,
+		model: modelSpec.value.model,
+		modelKey: modelSpec.value.modelKey,
+		agentDir,
+		thinking,
+		tools: resolveTools(profile),
+		prompt: resolvePrompt({
+			profile,
+			prompt: input.params.prompt
+		})
+	});
+}
+function modelKey(model) {
+	return `${model.provider}/${model.id}`;
+}
+function resolveTools(profile) {
+	if (!profile?.tools) return undefined;
+	const denied = new Set(Object.entries(profile.permissions).filter((entry) => entry[1] === "deny").map((entry) => entry[0]));
+	const tools = profile.tools.filter((tool) => !denied.has(tool.trim().toLowerCase()));
+	if (tools.length === 0) return undefined;
+	return tools;
+}
+function resolvePrompt(input) {
+	if (!input.profile?.prompt) return input.prompt;
+	return `${input.profile.prompt}\n\nTask:\n${input.prompt}`;
 }
 function resolveTarget(record, target) {
 	return record.taskIds.get(target) ?? target;
@@ -277,21 +345,66 @@ function resolveController(record, pipId) {
 	return record.taskControllers.get(pipId);
 }
 function parseModelSpec(input) {
-	const spec = input ?? defaultModel;
+	if (!input.spec && input.currentModel) {
+		return {
+			model: input.currentModel,
+			modelKey: modelKey(input.currentModel),
+			thinkingLevel: "medium"
+		};
+	}
+	const spec = input.spec ?? defaultModel;
 	const slash = spec.indexOf("/");
+	if (slash <= 0 || slash >= spec.length - 1) {
+		throw new Error(`Invalid subagent model '${spec}'. Expected '<provider>/<model>'`);
+	}
 	const colon = spec.lastIndexOf(":");
 	const provider = spec.slice(0, slash).trim();
 	const modelId = spec.slice(slash + 1, colon > slash ? colon : undefined).trim();
+	if (provider.length === 0 || modelId.length === 0) {
+		throw new Error(`Invalid subagent model '${spec}'. Expected '<provider>/<model>'`);
+	}
 	const thinkingLevel = parseThinkingLevel(colon > slash ? spec.slice(colon + 1) : "medium");
+	const registry = ModelRegistry.create(AuthStorage.create(path.join(input.agentDir, "auth.json")), path.join(input.agentDir, "models.json"));
+	const registeredModel = registry.find(provider, modelId);
+	if (registeredModel) return {
+		model: registeredModel,
+		modelKey: `${provider}/${modelId}`,
+		thinkingLevel
+	};
 	const knownProvider = getProviders().find((candidate) => candidate === provider);
-	if (!knownProvider) throw new Error(`Unknown subagent model provider '${provider}'`);
-	const model = getModels(knownProvider).find((candidate) => candidate.id === modelId);
-	if (!model) throw new Error(`Unknown subagent model '${provider}/${modelId}'`);
+	const model = knownProvider ? getModels(knownProvider).find((candidate) => candidate.id === modelId) ?? createExternalModel({
+		provider,
+		modelId
+	}) : createExternalModel({
+		provider,
+		modelId
+	});
 	return {
 		model,
+		modelKey: `${provider}/${modelId}`,
 		thinkingLevel
 	};
 }
+function createExternalModel(input) {
+	const api = input.provider;
+	return {
+		id: input.modelId,
+		name: input.modelId,
+		api,
+		provider: input.provider,
+		baseUrl: "",
+		reasoning: true,
+		input: ["text"],
+		cost: {
+			input: 0,
+			output: 0,
+			cacheRead: 0,
+			cacheWrite: 0
+		},
+		contextWindow: 128e3,
+		maxTokens: 8192
+	};
+}
 function parseThinkingLevel(input) {
 	const level = input.trim().toLowerCase();
 	if (level === "off") return "off";
@@ -327,4 +440,4 @@ function toolError(message) {
 }
 
 //#endregion
-export { createSubagentToolRuntime, createSubagentTools, registerAgentControllerTool };
+export { createSubagentToolRuntime, createSubagentTools, registerAgentControllerTool, resolveSpawnConfig };

package/dist/config.d.ts

@@ -1,6 +1,6 @@
 import { SubagentProfilePatch, SubagentProfilePatchSchema, SubagentProfileVariantMapPatchSchema, SubagentProfileVariantPatch, SubagentProfileVariantPatchSchema, SubagentToolPermissionDecisionPatch, SubagentToolPermissionDecisionSchema, SubagentToolPermissionMapSchema, parseSubagentProfilePatch, parseSubagentProfileVariantPatch } from "./schema.js";
-import { Type } from "typebox";
 import * as _$_pi_ohm_core_config0 from "@pi-ohm/core/config";
+import { Type } from "typebox";
 
 //#region src/config.d.ts
 declare const SubagentsConfigSchema: Type.TRecord<"^.*$", Type.TUnknown>;
@@ -9,6 +9,9 @@ interface SubagentsConfig {
 }
 interface SubagentProfileRuntimeConfig {
   model?: string;
+  thinking?: SubagentThinkingLevel;
+  tools?: readonly string[];
+  maxTurns?: number;
   prompt?: string;
   description?: string;
   whenToUse?: readonly string[];
@@ -18,6 +21,9 @@ interface SubagentProfileRuntimeConfig {
 type SubagentToolPermissionDecision = "allow" | "deny" | "inherit";
 interface SubagentProfileVariantRuntimeConfig {
   model?: string;
+  thinking?: SubagentThinkingLevel;
+  tools?: readonly string[];
+  maxTurns?: number;
   prompt?: string;
   description?: string;
   whenToUse?: readonly string[];
@@ -25,6 +31,9 @@ interface SubagentProfileVariantRuntimeConfig {
 }
 interface ResolvedSubagentProfileRuntimeConfig {
   model?: string;
+  thinking?: SubagentThinkingLevel;
+  tools?: readonly string[];
+  maxTurns?: number;
   prompt?: string;
   description?: string;
   whenToUse?: readonly string[];
@@ -43,6 +52,7 @@ interface SubagentRuntimeConfig {
   profiles: Record<string, SubagentProfileRuntimeConfig>;
 }
 type SubagentBackend = "none" | "interactive-shell" | "interactive-sdk" | "custom-plugin";
+type SubagentThinkingLevel = "off" | "minimal" | "low" | "medium" | "high" | "xhigh";
 interface RuntimeConfigWithSubagents {
   readonly subagents?: SubagentRuntimeConfig;
 }
@@ -66,4 +76,4 @@ declare function resolveSubagentProfileRuntimeConfig(input: {
 }): ResolvedSubagentProfileRuntimeConfig | undefined;
 declare function isSubagentRuntimeConfig(value: unknown): value is SubagentRuntimeConfig;
 //#endregion
-export { DEFAULT_SUBAGENT_RUNTIME_CONFIG, ResolvedSubagentProfileRuntimeConfig, SubagentBackend, type SubagentProfilePatch, SubagentProfilePatchSchema, SubagentProfileRuntimeConfig, SubagentProfileVariantMapPatchSchema, type SubagentProfileVariantPatch, SubagentProfileVariantPatchSchema, SubagentProfileVariantRuntimeConfig, SubagentRuntimeConfig, SubagentToolPermissionDecision, type SubagentToolPermissionDecisionPatch, SubagentToolPermissionDecisionSchema, SubagentToolPermissionMapSchema, SubagentsConfig, SubagentsConfigSchema, getSubagentConfiguredModel, getSubagentProfileRuntimeConfig, isSubagentRuntimeConfig, mergeSubagentRuntimeConfig, normalizeSubagentModelOverride, parseSubagentProfilePatch, parseSubagentProfileVariantPatch, resolveSubagentProfileRuntimeConfig, resolveSubagentVariantPattern, subagentsConfigModule };
+export { DEFAULT_SUBAGENT_RUNTIME_CONFIG, ResolvedSubagentProfileRuntimeConfig, SubagentBackend, type SubagentProfilePatch, SubagentProfilePatchSchema, SubagentProfileRuntimeConfig, SubagentProfileVariantMapPatchSchema, type SubagentProfileVariantPatch, SubagentProfileVariantPatchSchema, SubagentProfileVariantRuntimeConfig, SubagentRuntimeConfig, SubagentThinkingLevel, SubagentToolPermissionDecision, type SubagentToolPermissionDecisionPatch, SubagentToolPermissionDecisionSchema, SubagentToolPermissionMapSchema, SubagentsConfig, SubagentsConfigSchema, getSubagentConfiguredModel, getSubagentProfileRuntimeConfig, isSubagentRuntimeConfig, mergeSubagentRuntimeConfig, normalizeSubagentModelOverride, parseSubagentProfilePatch, parseSubagentProfileVariantPatch, resolveSubagentProfileRuntimeConfig, resolveSubagentVariantPattern, subagentsConfigModule };

package/dist/config.js

@@ -1,7 +1,7 @@
 import { SubagentProfilePatchSchema, SubagentProfileVariantMapPatchSchema, SubagentProfileVariantPatchSchema, SubagentToolPermissionDecisionSchema, SubagentToolPermissionMapSchema, parseSubagentProfilePatch, parseSubagentProfileVariantPatch } from "./schema.js";
 import { Result } from "better-result";
-import { Type } from "typebox";
 import { registerConfig } from "@pi-ohm/core/config";
+import { Type } from "typebox";
 
 //#region src/config.ts
 const SubagentsConfigSchema = Type.Record(Type.String({ minLength: 1 }), Type.Unknown());
@@ -34,14 +34,6 @@ const SUBAGENT_RUNTIME_RESERVED_KEYS = new Set([
 	"permissions",
 	"profiles"
 ]);
-const SUBAGENT_THINKING_LEVELS = new Set([
-	"off",
-	"minimal",
-	"low",
-	"medium",
-	"high",
-	"xhigh"
-]);
 function isJsonMap(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -62,6 +54,26 @@ function normalizePositiveInteger(value, fallback) {
 	if (!Number.isInteger(value) || value <= 0) return fallback;
 	return value;
 }
+function normalizeOptionalPositiveInteger(value) {
+	if (typeof value !== "number") return undefined;
+	if (!Number.isInteger(value) || value <= 0) return undefined;
+	return value;
+}
+function isSubagentThinkingLevel(value) {
+	return value === "off" || value === "minimal" || value === "low" || value === "medium" || value === "high" || value === "xhigh";
+}
+function normalizeThinking(value) {
+	if (typeof value !== "string") return undefined;
+	const normalized = value.trim().toLowerCase();
+	if (!isSubagentThinkingLevel(normalized)) return undefined;
+	return normalized;
+}
+function normalizeStringList(value) {
+	if (!Array.isArray(value)) return undefined;
+	const normalized = value.map((entry) => typeof entry === "string" ? entry.trim() : "").filter((entry) => entry.length > 0);
+	if (normalized.length === 0) return undefined;
+	return normalized;
+}
 function normalizeSubagentBackend(value, fallback) {
 	if (value === "none" || value === "interactive-shell" || value === "interactive-sdk" || value === "custom-plugin") {
 		return value;
@@ -131,7 +143,7 @@ function stripThinkingSuffix(modelId) {
 		return trimmed;
 	}
 	const suffix = trimmed.slice(colonIndex + 1).trim().toLowerCase();
-	if (!SUBAGENT_THINKING_LEVELS.has(suffix)) {
+	if (!isSubagentThinkingLevel(suffix)) {
 		return trimmed;
 	}
 	return trimmed.slice(0, colonIndex).trim();
@@ -140,6 +152,9 @@ function mergeSubagentVariantConfig(patch, fallback) {
 	const parsedPatch = parseSubagentProfileVariantPatch(patch);
 	if (!parsedPatch) return fallback;
 	const model = normalizeSubagentModelOverride(parsedPatch.model);
+	const thinking = normalizeThinking(parsedPatch.thinking);
+	const tools = normalizeStringList(parsedPatch.tools);
+	const maxTurns = normalizeOptionalPositiveInteger(parsedPatch.maxTurns);
 	const prompt = parsedPatch.prompt;
 	const description = parsedPatch.description;
 	const whenToUse = parsedPatch.whenToUse;
@@ -148,12 +163,15 @@ function mergeSubagentVariantConfig(patch, fallback) {
 	const merged = {
 		...fallback,
 		...model ? { model } : {},
+		...thinking ? { thinking } : {},
+		...tools ? { tools } : {},
+		...maxTurns ? { maxTurns } : {},
 		...prompt ? { prompt } : {},
 		...description ? { description } : {},
 		...whenToUse ? { whenToUse } : {},
 		...Object.keys(permissions).length > 0 ? { permissions } : {}
 	};
-	const hasValues = merged.model !== undefined || merged.prompt !== undefined || merged.description !== undefined || merged.whenToUse !== undefined || merged.permissions !== undefined;
+	const hasValues = merged.model !== undefined || merged.thinking !== undefined || merged.tools !== undefined || merged.maxTurns !== undefined || merged.prompt !== undefined || merged.description !== undefined || merged.whenToUse !== undefined || merged.permissions !== undefined;
 	if (!hasValues) return undefined;
 	return merged;
 }
@@ -174,6 +192,9 @@ function mergeSubagentProfileConfig(patch, fallback) {
 	const parsedPatch = parseSubagentProfilePatch(patch);
 	if (!parsedPatch) return fallback;
 	const model = normalizeSubagentModelOverride(parsedPatch.model);
+	const thinking = normalizeThinking(parsedPatch.thinking);
+	const tools = normalizeStringList(parsedPatch.tools);
+	const maxTurns = normalizeOptionalPositiveInteger(parsedPatch.maxTurns);
 	const prompt = parsedPatch.prompt;
 	const description = parsedPatch.description;
 	const whenToUse = parsedPatch.whenToUse;
@@ -183,13 +204,16 @@ function mergeSubagentProfileConfig(patch, fallback) {
 	const merged = {
 		...fallback,
 		...model ? { model } : {},
+		...thinking ? { thinking } : {},
+		...tools ? { tools } : {},
+		...maxTurns ? { maxTurns } : {},
 		...prompt ? { prompt } : {},
 		...description ? { description } : {},
 		...whenToUse ? { whenToUse } : {},
 		...Object.keys(permissions).length > 0 ? { permissions } : {},
 		...Object.keys(variants).length > 0 ? { variants } : {}
 	};
-	const hasValues = merged.model !== undefined || merged.prompt !== undefined || merged.description !== undefined || merged.whenToUse !== undefined || merged.permissions !== undefined || merged.variants !== undefined;
+	const hasValues = merged.model !== undefined || merged.thinking !== undefined || merged.tools !== undefined || merged.maxTurns !== undefined || merged.prompt !== undefined || merged.description !== undefined || merged.whenToUse !== undefined || merged.permissions !== undefined || merged.variants !== undefined;
 	if (!hasValues) return undefined;
 	return merged;
 }
@@ -320,6 +344,9 @@ function resolveSubagentProfileRuntimeConfig(input) {
 	});
 	return {
 		model: variant?.model ?? profile.model,
+		thinking: variant?.thinking ?? profile.thinking,
+		tools: variant?.tools ?? profile.tools,
+		maxTurns: variant?.maxTurns ?? profile.maxTurns,
 		prompt: variant?.prompt ?? profile.prompt,
 		description: variant?.description ?? profile.description,
 		whenToUse: variant?.whenToUse ?? profile.whenToUse,

package/dist/extension.d.ts

@@ -1,9 +1,9 @@
-import { SubagentToolRuntime, createSubagentToolRuntime, createSubagentTools, registerAgentControllerTool } from "./agent-controller.js";
+import { SubagentToolRuntime, createSubagentToolRuntime, createSubagentTools, registerAgentControllerTool, resolveSpawnConfig } from "./agent-controller.js";
 import { SubagentProfilePatch, SubagentProfilePatchSchema, SubagentProfileVariantMapPatchSchema, SubagentProfileVariantPatch, SubagentProfileVariantPatchSchema, SubagentToolPermissionDecisionPatch, SubagentToolPermissionDecisionSchema, SubagentToolPermissionMapSchema, parseSubagentProfilePatch, parseSubagentProfileVariantPatch } from "./schema.js";
-import { DEFAULT_SUBAGENT_RUNTIME_CONFIG, ResolvedSubagentProfileRuntimeConfig, SubagentBackend, SubagentProfileRuntimeConfig, SubagentProfileVariantRuntimeConfig, SubagentRuntimeConfig, SubagentToolPermissionDecision, SubagentsConfig, SubagentsConfigSchema, getSubagentConfiguredModel, getSubagentProfileRuntimeConfig, isSubagentRuntimeConfig, mergeSubagentRuntimeConfig, normalizeSubagentModelOverride, resolveSubagentProfileRuntimeConfig, resolveSubagentVariantPattern, subagentsConfigModule } from "./config.js";
+import { DEFAULT_SUBAGENT_RUNTIME_CONFIG, ResolvedSubagentProfileRuntimeConfig, SubagentBackend, SubagentProfileRuntimeConfig, SubagentProfileVariantRuntimeConfig, SubagentRuntimeConfig, SubagentThinkingLevel, SubagentToolPermissionDecision, SubagentsConfig, SubagentsConfigSchema, getSubagentConfiguredModel, getSubagentProfileRuntimeConfig, isSubagentRuntimeConfig, mergeSubagentRuntimeConfig, normalizeSubagentModelOverride, resolveSubagentProfileRuntimeConfig, resolveSubagentVariantPattern, subagentsConfigModule } from "./config.js";
 import { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
 //#region src/extension.d.ts
 declare function registerSubagentsExtension(pi: ExtensionAPI): void;
 //#endregion
-export { DEFAULT_SUBAGENT_RUNTIME_CONFIG, ResolvedSubagentProfileRuntimeConfig, SubagentBackend, SubagentProfilePatch, SubagentProfilePatchSchema, SubagentProfileRuntimeConfig, SubagentProfileVariantMapPatchSchema, SubagentProfileVariantPatch, SubagentProfileVariantPatchSchema, SubagentProfileVariantRuntimeConfig, SubagentRuntimeConfig, SubagentToolPermissionDecision, SubagentToolPermissionDecisionPatch, SubagentToolPermissionDecisionSchema, SubagentToolPermissionMapSchema, SubagentToolRuntime, SubagentsConfig, SubagentsConfigSchema, createSubagentToolRuntime, createSubagentTools, registerSubagentsExtension as default, getSubagentConfiguredModel, getSubagentProfileRuntimeConfig, isSubagentRuntimeConfig, mergeSubagentRuntimeConfig, normalizeSubagentModelOverride, parseSubagentProfilePatch, parseSubagentProfileVariantPatch, registerAgentControllerTool, resolveSubagentProfileRuntimeConfig, resolveSubagentVariantPattern, subagentsConfigModule };
+export { DEFAULT_SUBAGENT_RUNTIME_CONFIG, ResolvedSubagentProfileRuntimeConfig, SubagentBackend, SubagentProfilePatch, SubagentProfilePatchSchema, SubagentProfileRuntimeConfig, SubagentProfileVariantMapPatchSchema, SubagentProfileVariantPatch, SubagentProfileVariantPatchSchema, SubagentProfileVariantRuntimeConfig, SubagentRuntimeConfig, SubagentThinkingLevel, SubagentToolPermissionDecision, SubagentToolPermissionDecisionPatch, SubagentToolPermissionDecisionSchema, SubagentToolPermissionMapSchema, SubagentToolRuntime, SubagentsConfig, SubagentsConfigSchema, createSubagentToolRuntime, createSubagentTools, registerSubagentsExtension as default, getSubagentConfiguredModel, getSubagentProfileRuntimeConfig, isSubagentRuntimeConfig, mergeSubagentRuntimeConfig, normalizeSubagentModelOverride, parseSubagentProfilePatch, parseSubagentProfileVariantPatch, registerAgentControllerTool, resolveSpawnConfig, resolveSubagentProfileRuntimeConfig, resolveSubagentVariantPattern, subagentsConfigModule };

package/dist/extension.js

@@ -1,6 +1,6 @@
-import { createSubagentToolRuntime, createSubagentTools, registerAgentControllerTool } from "./agent-controller.js";
 import { SubagentProfilePatchSchema, SubagentProfileVariantMapPatchSchema, SubagentProfileVariantPatchSchema, SubagentToolPermissionDecisionSchema, SubagentToolPermissionMapSchema, parseSubagentProfilePatch, parseSubagentProfileVariantPatch } from "./schema.js";
 import { DEFAULT_SUBAGENT_RUNTIME_CONFIG, SubagentsConfigSchema, getSubagentConfiguredModel, getSubagentProfileRuntimeConfig, isSubagentRuntimeConfig, mergeSubagentRuntimeConfig, normalizeSubagentModelOverride, resolveSubagentProfileRuntimeConfig, resolveSubagentVariantPattern, subagentsConfigModule } from "./config.js";
+import { createSubagentToolRuntime, createSubagentTools, registerAgentControllerTool, resolveSpawnConfig } from "./agent-controller.js";
 
 //#region src/extension.ts
 function registerSubagentsExtension(pi) {
@@ -8,4 +8,4 @@ function registerSubagentsExtension(pi) {
 }
 
 //#endregion
-export { DEFAULT_SUBAGENT_RUNTIME_CONFIG, SubagentProfilePatchSchema, SubagentProfileVariantMapPatchSchema, SubagentProfileVariantPatchSchema, SubagentToolPermissionDecisionSchema, SubagentToolPermissionMapSchema, SubagentsConfigSchema, createSubagentToolRuntime, createSubagentTools, registerSubagentsExtension as default, getSubagentConfiguredModel, getSubagentProfileRuntimeConfig, isSubagentRuntimeConfig, mergeSubagentRuntimeConfig, normalizeSubagentModelOverride, parseSubagentProfilePatch, parseSubagentProfileVariantPatch, registerAgentControllerTool, resolveSubagentProfileRuntimeConfig, resolveSubagentVariantPattern, subagentsConfigModule };
+export { DEFAULT_SUBAGENT_RUNTIME_CONFIG, SubagentProfilePatchSchema, SubagentProfileVariantMapPatchSchema, SubagentProfileVariantPatchSchema, SubagentToolPermissionDecisionSchema, SubagentToolPermissionMapSchema, SubagentsConfigSchema, createSubagentToolRuntime, createSubagentTools, registerSubagentsExtension as default, getSubagentConfiguredModel, getSubagentProfileRuntimeConfig, isSubagentRuntimeConfig, mergeSubagentRuntimeConfig, normalizeSubagentModelOverride, parseSubagentProfilePatch, parseSubagentProfileVariantPatch, registerAgentControllerTool, resolveSpawnConfig, resolveSubagentProfileRuntimeConfig, resolveSubagentVariantPattern, subagentsConfigModule };

package/dist/schema.d.ts

@@ -5,6 +5,9 @@ declare const SubagentToolPermissionDecisionSchema: Type.TUnion<[Type.TLiteral<"
 declare const SubagentToolPermissionMapSchema: Type.TRecord<"^.*$", Type.TUnion<[Type.TLiteral<"allow">, Type.TLiteral<"deny">, Type.TLiteral<"inherit">, Type.TLiteral<"ask">]>>;
 declare const SubagentProfileVariantPatchSchema: Type.TObject<{
   model: Type.TOptional<Type.TString>;
+  thinking: Type.TOptional<Type.TUnion<[Type.TLiteral<"off">, Type.TLiteral<"minimal">, Type.TLiteral<"low">, Type.TLiteral<"medium">, Type.TLiteral<"high">, Type.TLiteral<"xhigh">]>>;
+  tools: Type.TOptional<Type.TArray<Type.TString>>;
+  maxTurns: Type.TOptional<Type.TInteger>;
   prompt: Type.TOptional<Type.TString>;
   description: Type.TOptional<Type.TString>;
   whenToUse: Type.TOptional<Type.TArray<Type.TString>>;
@@ -12,6 +15,9 @@ declare const SubagentProfileVariantPatchSchema: Type.TObject<{
 }>;
 declare const SubagentProfileVariantMapPatchSchema: Type.TRecord<"^.*$", Type.TObject<{
   model: Type.TOptional<Type.TString>;
+  thinking: Type.TOptional<Type.TUnion<[Type.TLiteral<"off">, Type.TLiteral<"minimal">, Type.TLiteral<"low">, Type.TLiteral<"medium">, Type.TLiteral<"high">, Type.TLiteral<"xhigh">]>>;
+  tools: Type.TOptional<Type.TArray<Type.TString>>;
+  maxTurns: Type.TOptional<Type.TInteger>;
   prompt: Type.TOptional<Type.TString>;
   description: Type.TOptional<Type.TString>;
   whenToUse: Type.TOptional<Type.TArray<Type.TString>>;
@@ -19,12 +25,18 @@ declare const SubagentProfileVariantMapPatchSchema: Type.TRecord<"^.*$", Type.TO
 }>>;
 declare const SubagentProfilePatchSchema: Type.TObject<{
   model: Type.TOptional<Type.TString>;
+  thinking: Type.TOptional<Type.TUnion<[Type.TLiteral<"off">, Type.TLiteral<"minimal">, Type.TLiteral<"low">, Type.TLiteral<"medium">, Type.TLiteral<"high">, Type.TLiteral<"xhigh">]>>;
+  tools: Type.TOptional<Type.TArray<Type.TString>>;
+  maxTurns: Type.TOptional<Type.TInteger>;
   prompt: Type.TOptional<Type.TString>;
   description: Type.TOptional<Type.TString>;
   whenToUse: Type.TOptional<Type.TArray<Type.TString>>;
   permissions: Type.TOptional<Type.TRecord<"^.*$", Type.TUnion<[Type.TLiteral<"allow">, Type.TLiteral<"deny">, Type.TLiteral<"inherit">, Type.TLiteral<"ask">]>>>;
   variants: Type.TOptional<Type.TRecord<"^.*$", Type.TObject<{
     model: Type.TOptional<Type.TString>;
+    thinking: Type.TOptional<Type.TUnion<[Type.TLiteral<"off">, Type.TLiteral<"minimal">, Type.TLiteral<"low">, Type.TLiteral<"medium">, Type.TLiteral<"high">, Type.TLiteral<"xhigh">]>>;
+    tools: Type.TOptional<Type.TArray<Type.TString>>;
+    maxTurns: Type.TOptional<Type.TInteger>;
     prompt: Type.TOptional<Type.TString>;
     description: Type.TOptional<Type.TString>;
     whenToUse: Type.TOptional<Type.TArray<Type.TString>>;

package/dist/schema.js

@@ -13,6 +13,16 @@ const SubagentToolPermissionDecisionSchema = Type.Union([
 const SubagentToolPermissionMapSchema = Type.Record(NonEmptyStringSchema, SubagentToolPermissionDecisionSchema);
 const SubagentProfileVariantPatchSchema = Type.Object({
 	model: Type.Optional(NonEmptyStringSchema),
+	thinking: Type.Optional(Type.Union([
+		Type.Literal("off"),
+		Type.Literal("minimal"),
+		Type.Literal("low"),
+		Type.Literal("medium"),
+		Type.Literal("high"),
+		Type.Literal("xhigh")
+	])),
+	tools: Type.Optional(NonEmptyStringArraySchema),
+	maxTurns: Type.Optional(Type.Integer({ minimum: 1 })),
 	prompt: Type.Optional(NonEmptyStringSchema),
 	description: Type.Optional(NonEmptyStringSchema),
 	whenToUse: Type.Optional(NonEmptyStringArraySchema),
@@ -21,6 +31,16 @@ const SubagentProfileVariantPatchSchema = Type.Object({
 const SubagentProfileVariantMapPatchSchema = Type.Record(NonEmptyStringSchema, SubagentProfileVariantPatchSchema);
 const SubagentProfilePatchSchema = Type.Object({
 	model: Type.Optional(NonEmptyStringSchema),
+	thinking: Type.Optional(Type.Union([
+		Type.Literal("off"),
+		Type.Literal("minimal"),
+		Type.Literal("low"),
+		Type.Literal("medium"),
+		Type.Literal("high"),
+		Type.Literal("xhigh")
+	])),
+	tools: Type.Optional(NonEmptyStringArraySchema),
+	maxTurns: Type.Optional(Type.Integer({ minimum: 1 })),
 	prompt: Type.Optional(NonEmptyStringSchema),
 	description: Type.Optional(NonEmptyStringSchema),
 	whenToUse: Type.Optional(NonEmptyStringArraySchema),
@@ -42,6 +62,19 @@ function toTrimmedStringArray(value) {
 	if (normalized.length === 0) return undefined;
 	return normalized;
 }
+function toPositiveInteger(value) {
+	if (typeof value !== "number") return undefined;
+	if (!Number.isInteger(value) || value <= 0) return undefined;
+	return value;
+}
+function toThinking(value) {
+	const trimmed = toTrimmedString(value)?.toLowerCase();
+	if (!trimmed) return undefined;
+	if (trimmed !== "off" && trimmed !== "minimal" && trimmed !== "low" && trimmed !== "medium" && trimmed !== "high" && trimmed !== "xhigh") {
+		return undefined;
+	}
+	return trimmed;
+}
 function normalizeSubagentPermissionMapInput(value) {
 	if (!isObjectRecord(value)) return undefined;
 	const normalized = {};
@@ -63,12 +96,18 @@ function normalizeSubagentPermissionMapInput(value) {
 function normalizeSubagentProfileVariantPatchInput(input) {
 	if (!isObjectRecord(input)) return input;
 	const model = toTrimmedString(Reflect.get(input, "model"));
+	const thinking = toThinking(Reflect.get(input, "thinking"));
+	const tools = toTrimmedStringArray(Reflect.get(input, "tools"));
+	const maxTurns = toPositiveInteger(Reflect.get(input, "maxTurns"));
 	const prompt = toTrimmedString(Reflect.get(input, "prompt"));
 	const description = toTrimmedString(Reflect.get(input, "description"));
 	const whenToUse = toTrimmedStringArray(Reflect.get(input, "whenToUse"));
 	const permissions = normalizeSubagentPermissionMapInput(Reflect.get(input, "permissions"));
 	return {
 		...model ? { model } : {},
+		...thinking ? { thinking } : {},
+		...tools ? { tools } : {},
+		...maxTurns ? { maxTurns } : {},
 		...prompt ? { prompt } : {},
 		...description ? { description } : {},
 		...whenToUse ? { whenToUse } : {},
@@ -95,6 +134,9 @@ function normalizeSubagentProfileVariantMapInput(input) {
 function normalizeSubagentProfilePatchInput(input) {
 	if (!isObjectRecord(input)) return input;
 	const model = toTrimmedString(Reflect.get(input, "model"));
+	const thinking = toThinking(Reflect.get(input, "thinking"));
+	const tools = toTrimmedStringArray(Reflect.get(input, "tools"));
+	const maxTurns = toPositiveInteger(Reflect.get(input, "maxTurns"));
 	const prompt = toTrimmedString(Reflect.get(input, "prompt"));
 	const description = toTrimmedString(Reflect.get(input, "description"));
 	const whenToUse = toTrimmedStringArray(Reflect.get(input, "whenToUse"));
@@ -102,6 +144,9 @@ function normalizeSubagentProfilePatchInput(input) {
 	const variants = normalizeSubagentProfileVariantMapInput(Reflect.get(input, "variants"));
 	return {
 		...model ? { model } : {},
+		...thinking ? { thinking } : {},
+		...tools ? { tools } : {},
+		...maxTurns ? { maxTurns } : {},
 		...prompt ? { prompt } : {},
 		...description ? { description } : {},
 		...whenToUse ? { whenToUse } : {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-ohm/subagents",
-  "version": "0.6.4-dev.25620170147.1.0b6891f",
+  "version": "0.6.4-dev.25632661332.1.3bf351f",
   "homepage": "https://github.com/pi-ohm/pi-ohm/tree/dev/packages/subagents#readme",
   "repository": {
     "type": "git",
@@ -36,8 +36,8 @@
     "@earendil-works/pi-agent-core": "0.74.0",
     "@earendil-works/pi-ai": "0.74.0",
     "@earendil-works/pi-coding-agent": "0.74.0",
-    "@pi-ohm/core": "0.6.4-dev.25620170147.1.0b6891f",
-    "@pi-ohm/tui": "0.6.4-dev.25620170147.1.0b6891f",
+    "@pi-ohm/core": "0.6.4-dev.25632661332.1.3bf351f",
+    "@pi-ohm/tui": "0.6.4-dev.25632661332.1.3bf351f",
     "better-result": "2.9.2",
     "typebox": "^1.0.68",
     "zod": "^4"