@narumitw/pi-subagents 0.17.2 → 0.20.0

package/README.md

@@ -67,7 +67,7 @@ Common controls:
 
 - `cwd` — run a job from a different working directory.
 - `timeoutMs` — set a hard subprocess timeout.
-- `thinkingLevel` — request `off`, `minimal`, `low`, `medium`, `high`, or `xhigh` thinking for the spawned Pi process.
+- `thinkingLevel` — request `off`, `minimal`, `low`, `medium`, `high`, `xhigh`, or `max` thinking for the spawned Pi process.
 
 ## 🧭 Proactive use
 
@@ -381,7 +381,7 @@ Each subprocess has a hard timeout to avoid runaway workers.
 - Set `timeoutMs` on a task, chain step, or aggregator to override it locally.
 - If omitted, the default is `PI_SUBAGENT_TIMEOUT_MS`, or `600000` milliseconds (10 minutes) when unset.
 
-Set `thinkingLevel` to pass Pi's `--thinking <level>` to a subprocess. Supported values are `off`, `minimal`, `low`, `medium`, `high`, and `xhigh`.
+Set `thinkingLevel` to pass Pi's `--thinking <level>` to a subprocess. Supported values are `off`, `minimal`, `low`, `medium`, `high`, `xhigh`, and `max`.
 
 Thinking-level precedence is: task/chain step/aggregator `thinkingLevel` → top-level `thinkingLevel` → agent default from config or frontmatter → Pi subprocess default. Omit `thinkingLevel` to preserve existing behavior. Pi still owns model capability clamping, so unsupported thinking levels are handled by the spawned Pi process.
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@narumitw/pi-subagents",
-	"version": "0.17.2",
+	"version": "0.20.0",
 	"description": "Pi extension for delegating work to specialized isolated subagents.",
 	"type": "module",
 	"license": "MIT",
@@ -39,11 +39,11 @@
 	},
 	"devDependencies": {
 		"@biomejs/biome": "2.5.3",
-		"@earendil-works/pi-agent-core": "0.80.6",
-		"@earendil-works/pi-ai": "0.80.3",
-		"@earendil-works/pi-coding-agent": "0.80.3",
-		"@earendil-works/pi-tui": "0.80.3",
-		"typescript": "6.0.3"
+		"@earendil-works/pi-agent-core": "0.80.10",
+		"@earendil-works/pi-ai": "0.80.10",
+		"@earendil-works/pi-coding-agent": "0.80.10",
+		"@earendil-works/pi-tui": "0.80.10",
+		"typescript": "7.0.2"
 	},
 	"repository": {
 		"type": "git",

package/src/agents.ts

@@ -4,10 +4,17 @@
 
 import * as fs from "node:fs";
 import * as path from "node:path";
-import type { ThinkingLevel } from "@earendil-works/pi-agent-core";
 import { getAgentDir, parseFrontmatter } from "@earendil-works/pi-coding-agent";
 
-export const THINKING_LEVELS = ["off", "minimal", "low", "medium", "high", "xhigh"] as const satisfies readonly ThinkingLevel[];
+export const THINKING_LEVELS = [
+	"off",
+	"minimal",
+	"low",
+	"medium",
+	"high",
+	"xhigh",
+	"max",
+] as const;
 
 export type SubagentThinkingLevel = (typeof THINKING_LEVELS)[number];
 

package/src/config-ui.ts

@@ -4,8 +4,8 @@ import {
 	Container,
 	Key,
 	matchesKey,
-	SelectList,
 	type SelectItem,
+	SelectList,
 	Spacer,
 	Text,
 	truncateToWidth,
@@ -20,7 +20,7 @@ import {
 	uniqueToolNames,
 } from "./settings.js";
 
-class ToolToggleList {
+export class ToolToggleList {
 	private items: { name: string; selected: boolean }[];
 	private cursor = 0;
 	private cachedWidth?: number;
@@ -98,6 +98,7 @@ export function registerSubagentConfigCommand(pi: ExtensionAPI) {
 			}
 
 			// Loop: agent selection → tool toggle (Esc in tools returns here)
+			let selectedAgentIndex = 0;
 			while (true) {
 				// Step 1: pick an agent to configure
 				const agentItems: SelectItem[] = agents.map((a) => {
@@ -133,7 +134,20 @@ export function registerSubagentConfigCommand(pi: ExtensionAPI) {
 						scrollInfo: (t: string) => theme.fg("dim", t),
 						noMatch: (t: string) => theme.fg("warning", t),
 					});
-					selectList.onSelect = (item) => done(item.value);
+					selectList.setSelectedIndex(selectedAgentIndex);
+					selectList.onSelectionChange = (item) => {
+						selectedAgentIndex = Math.max(
+							0,
+							agentItems.findIndex((candidate) => candidate.value === item.value),
+						);
+					};
+					selectList.onSelect = (item) => {
+						selectedAgentIndex = Math.max(
+							0,
+							agentItems.findIndex((candidate) => candidate.value === item.value),
+						);
+						done(item.value);
+					};
 					selectList.onCancel = () => done(null);
 					container.addChild(selectList);
 					container.addChild(
@@ -193,7 +207,11 @@ export function registerSubagentConfigCommand(pi: ExtensionAPI) {
 					);
 					container.addChild(new Spacer(1));
 					container.addChild(
-						new Text(theme.fg("muted", "Toggle tools with Enter/Space. S to save, Esc to cancel."), 1, 0),
+						new Text(
+							theme.fg("muted", "Toggle tools with Enter/Space. S to save, Esc to cancel."),
+							1,
+							0,
+						),
 					);
 					container.addChild(new Spacer(1));
 
@@ -206,7 +224,11 @@ export function registerSubagentConfigCommand(pi: ExtensionAPI) {
 
 					container.addChild(new Spacer(1));
 					container.addChild(
-						new Text(theme.fg("dim", "↑↓ navigate · enter/space toggle · S save · esc cancel"), 1, 0),
+						new Text(
+							theme.fg("dim", "↑↓ navigate · enter/space toggle · S save · esc cancel"),
+							1,
+							0,
+						),
 					);
 					container.addChild(new DynamicBorder((s: string) => theme.fg("accent", s)));
 

package/src/in-process-transport.ts

@@ -1,3 +1,4 @@
+import { join } from "node:path";
 import type { Api, Model } from "@earendil-works/pi-ai";
 import {
 	createAgentSession,
@@ -7,7 +8,12 @@ import {
 	SessionManager,
 	SettingsManager,
 } from "@earendil-works/pi-coding-agent";
-import { type AgentConfig, discoverAgents, type SubagentThinkingLevel } from "./agents.js";
+import {
+	type AgentConfig,
+	discoverAgents,
+	isThinkingLevel,
+	type SubagentThinkingLevel,
+} from "./agents.js";
 import { redactPrivateText } from "./context.js";
 import { resolveDefaultSubagentTimeoutMs } from "./execution.js";
 import { DEFAULT_MAX_CONTEXT_BYTES, DEFAULT_MAX_OUTPUT_BYTES, truncateUtf8 } from "./limits.js";
@@ -18,6 +24,25 @@ import type { SubagentTransport } from "./transport.js";
 const BUILT_IN_TOOL_NAMES = new Set(["read", "bash", "edit", "write", "grep", "find", "ls"]);
 const DEFAULT_ABORT_GRACE_MS = 5_000;
 
+interface ChildModelRuntime {
+	getModel(provider: string, modelId: string): Model<Api> | undefined;
+	registerProvider(provider: string, config: unknown): void;
+	registerNativeProvider?(provider: unknown): void;
+	setRuntimeApiKey(provider: string, apiKey: string): Promise<void> | void;
+}
+
+interface CodingAgentRuntimeModule {
+	ModelRuntime?: {
+		create(options?: { authPath?: string; modelsPath?: string | null }): Promise<ChildModelRuntime>;
+	};
+}
+
+interface RegisteredProviderRegistry {
+	getRegisteredProviderConfig?(provider: string): unknown;
+	getRegisteredProviderIds?(): readonly string[];
+	getRegisteredNativeProvider?(provider: string): unknown;
+}
+
 export interface ParentRuntimeSnapshot {
 	model: Model<Api> | undefined;
 	thinkingLevel: SubagentThinkingLevel;
@@ -316,20 +341,31 @@ export async function createSdkChildSession(
 		options.agent.agentScope === "project" || options.agent.agentScope === "both",
 	);
 	const resolved = await resolveChildModel(options);
+	const modelRuntime = await createChildModelRuntime(
+		options.modelRegistry,
+		resolved.model,
+		agentDir,
+	);
+	const model =
+		modelRuntime?.getModel(resolved.model.provider, resolved.model.id) ?? resolved.model;
 	const sessionManager = SessionManager.inMemory(options.agent.cwd);
-	seedChildSessionManager(sessionManager, options, resolved.model);
-	const created = await createAgentSession({
+	seedChildSessionManager(sessionManager, options, model);
+	const sessionOptions: Record<string, unknown> = {
 		cwd: options.agent.cwd,
 		agentDir,
-		model: resolved.model,
+		model,
 		thinkingLevel: resolved.thinkingLevel,
-		modelRegistry: options.modelRegistry,
 		resourceLoader,
 		settingsManager,
 		sessionManager,
 		tools: options.tools,
 		noTools: options.tools?.length === 0 ? "all" : undefined,
-	});
+	};
+	if (modelRuntime) sessionOptions.modelRuntime = modelRuntime;
+	else sessionOptions.modelRegistry = options.modelRegistry;
+	const created = await createAgentSession(
+		sessionOptions as NonNullable<Parameters<typeof createAgentSession>[0]>,
+	);
 	const session = created.session;
 	if (options.tools !== undefined) {
 		const active = session.getActiveToolNames();
@@ -359,6 +395,42 @@ export async function createSdkChildSession(
 	};
 }
 
+async function createChildModelRuntime(
+	modelRegistry: ModelRegistry,
+	model: Model<Api>,
+	agentDir: string,
+): Promise<ChildModelRuntime | undefined> {
+	const codingAgentModule = (await import(
+		"@earendil-works/pi-coding-agent"
+	)) as unknown as CodingAgentRuntimeModule;
+	if (!codingAgentModule.ModelRuntime) return undefined;
+
+	const modelRuntime = await codingAgentModule.ModelRuntime.create({
+		authPath: join(agentDir, "auth.json"),
+		modelsPath: join(agentDir, "models.json"),
+	});
+	const registeredProviders = modelRegistry as unknown as RegisteredProviderRegistry;
+	copyRegisteredProviders(registeredProviders, modelRuntime);
+	const auth = await modelRegistry.getApiKeyAndHeaders(model);
+	if (auth.ok && auth.apiKey) await modelRuntime.setRuntimeApiKey(model.provider, auth.apiKey);
+	return modelRuntime;
+}
+
+export function copyRegisteredProviders(
+	registeredProviders: RegisteredProviderRegistry,
+	modelRuntime: ChildModelRuntime,
+): void {
+	for (const provider of registeredProviders.getRegisteredProviderIds?.() ?? []) {
+		const config = registeredProviders.getRegisteredProviderConfig?.(provider);
+		if (config !== undefined) {
+			modelRuntime.registerProvider(provider, config);
+			continue;
+		}
+		const nativeProvider = registeredProviders.getRegisteredNativeProvider?.(provider);
+		if (nativeProvider) modelRuntime.registerNativeProvider?.(nativeProvider);
+	}
+}
+
 export async function resolveChildModel(options: ChildSessionCreateOptions): Promise<{
 	model: Model<Api>;
 	thinkingLevel: SubagentThinkingLevel;
@@ -390,14 +462,7 @@ function parseModelRequest(value: string): {
 	const separator = requested.lastIndexOf(":");
 	if (separator > 0) {
 		const suffix = requested.slice(separator + 1);
-		if (
-			suffix === "off" ||
-			suffix === "minimal" ||
-			suffix === "low" ||
-			suffix === "medium" ||
-			suffix === "high" ||
-			suffix === "xhigh"
-		) {
+		if (isThinkingLevel(suffix)) {
 			return { model: requested.slice(0, separator), thinkingLevel: suffix };
 		}
 	}

package/src/params.ts

@@ -9,7 +9,8 @@ const TimeoutMs = Type.Number({
 });
 
 const ThinkingLevelSchema = StringEnum(THINKING_LEVELS, {
-	description: "Pi thinking level for the subagent process: off, minimal, low, medium, high, or xhigh.",
+	description:
+		"Pi thinking level for the subagent process: off, minimal, low, medium, high, xhigh, or max.",
 });
 
 const TaskItem = Type.Object({

package/src/stateful.ts

@@ -3,7 +3,7 @@ import * as path from "node:path";
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { StringEnum } from "@earendil-works/pi-ai";
 import { Type } from "typebox";
-import { discoverAgents, type AgentScope } from "./agents.js";
+import { discoverAgents, type AgentScope, isThinkingLevel } from "./agents.js";
 import { buildContextSnapshot, type ContextMode, redactPrivateText } from "./context.js";
 import { assertSubagentDepthAllowed } from "./execution.js";
 import { DEFAULT_MAX_CONTEXT_BYTES, truncateUtf8 } from "./limits.js";
@@ -830,10 +830,7 @@ export function resolveStatefulTransportKind(
 }
 
 function normalizeRuntimeThinkingLevel(value: string): ParentRuntimeSnapshot["thinkingLevel"] {
-	if (value === "off" || value === "minimal" || value === "low" || value === "medium" || value === "high" || value === "xhigh") {
-		return value;
-	}
-	return value === "max" ? "xhigh" : "off";
+	return isThinkingLevel(value) ? value : "off";
 }
 
 export {