@oh-my-pi/pi-coding-agent 8.3.0 → 8.4.0

package/src/task/executor.ts

@@ -5,10 +5,13 @@
  */
 import path from "node:path";
 import type { AgentEvent, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
-import type { ToolSession } from "..";
+import type { PromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
+import type { Skill } from "@oh-my-pi/pi-coding-agent/extensibility/skills";
+import { getPreludeDocs } from "@oh-my-pi/pi-coding-agent/ipy/executor";
+import { checkPythonKernelAvailability } from "@oh-my-pi/pi-coding-agent/ipy/kernel";
+import type { ContextFileEntry, ToolSession } from "@oh-my-pi/pi-coding-agent/tools";
 import type { ModelRegistry } from "../config/model-registry";
 import { formatModelString, parseModelPattern } from "../config/model-resolver";
-import { checkPythonKernelAvailability } from "../ipy/kernel";
 import { LspTool } from "../lsp";
 import type { LspParams } from "../lsp/types";
 import { callTool } from "../mcp/client";
@@ -37,6 +40,19 @@ import type {
 	SubagentWorkerResponse,
 } from "./worker-protocol";
 
+const DEFAULT_MODEL_ALIASES = new Set(["default", "pi/default", "omp/default"]);
+
+function normalizeModelPatterns(value: string | string[] | undefined): string[] {
+	if (!value) return [];
+	if (Array.isArray(value)) {
+		return value.map(entry => entry.trim()).filter(Boolean);
+	}
+	return value
+		.split(",")
+		.map(entry => entry.trim())
+		.filter(Boolean);
+}
+
 /** Options for worker execution */
 export interface ExecutorOptions {
 	cwd: string;
@@ -47,7 +63,7 @@ export interface ExecutorOptions {
 	index: number;
 	id: string;
 	context?: string;
-	modelOverride?: string;
+	modelOverride?: string | string[];
 	thinkingLevel?: ThinkingLevel;
 	outputSchema?: unknown;
 	enableLsp?: boolean;
@@ -57,6 +73,9 @@ export interface ExecutorOptions {
 	persistArtifacts?: boolean;
 	artifactsDir?: string;
 	eventBus?: EventBus;
+	contextFiles?: ContextFileEntry[];
+	skills?: Skill[];
+	promptTemplates?: PromptTemplate[];
 	mcpManager?: MCPManager;
 	authStorage?: AuthStorage;
 	modelRegistry?: ModelRegistry;
@@ -277,23 +296,30 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 	const serializedSettings = options.settingsManager?.serialize();
 	const availableModels = options.modelRegistry?.getAvailable() ?? [];
 
-	// Resolve model pattern to provider/modelId string
-	const modelPattern = modelOverride ?? agent.model;
+	// Resolve model pattern list to provider/modelId string
+	const modelPatterns = normalizeModelPatterns(modelOverride ?? agent.model);
 	let resolvedModel: string | undefined;
-	if (modelPattern) {
-		// Handle omp/<role> or pi/<role> aliases (e.g., "omp/slow", "pi/fast")
-		let effectivePattern = modelPattern;
-		const lower = modelPattern.toLowerCase();
-		if (lower.startsWith("omp/") || lower.startsWith("pi/")) {
-			const role = lower.startsWith("omp/") ? modelPattern.slice(4) : modelPattern.slice(3);
-			const roles = serializedSettings?.modelRoles as Record<string, string> | undefined;
-			const configured = roles?.[role] ?? roles?.[role.toLowerCase()];
-			if (configured) {
-				effectivePattern = configured;
+	if (modelPatterns.length > 0) {
+		const roles = serializedSettings?.modelRoles as Record<string, string> | undefined;
+		for (const pattern of modelPatterns) {
+			const normalized = pattern.trim().toLowerCase();
+			if (!normalized || DEFAULT_MODEL_ALIASES.has(normalized)) {
+				continue;
+			}
+			let effectivePattern = pattern;
+			if (normalized.startsWith("omp/") || normalized.startsWith("pi/")) {
+				const role = normalized.startsWith("omp/") ? pattern.slice(4) : pattern.slice(3);
+				const configured = roles?.[role] ?? roles?.[role.toLowerCase()];
+				if (configured) {
+					effectivePattern = configured;
+				}
+			}
+			const { model } = parseModelPattern(effectivePattern, availableModels);
+			if (model) {
+				resolvedModel = formatModelString(model);
+				break;
 			}
 		}
-		const { model } = parseModelPattern(effectivePattern, availableModels);
-		resolvedModel = model ? formatModelString(model) : undefined;
 	}
 	const sessionFile = subtaskSessionFile ?? null;
 	const spawnsEnv = agent.spawns === undefined ? "" : agent.spawns === "*" ? "*" : agent.spawns.join(",");
@@ -307,6 +333,8 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 
 	const lspEnabled = enableLsp ?? true;
 	const lspToolRequested = lspEnabled && (toolNames === undefined || toolNames.includes("lsp"));
+	const pythonPreludeDocs = getPreludeDocs();
+	const pythonPreludeDocsPayload = pythonPreludeDocs.length > 0 ? pythonPreludeDocs : undefined;
 
 	let worker: Worker;
 	try {
@@ -692,6 +720,10 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 			serializedAuth: options.authStorage?.serialize(),
 			serializedModels: options.modelRegistry?.serialize(),
 			serializedSettings,
+			pythonPreludeDocs: pythonPreludeDocsPayload,
+			contextFiles: options.contextFiles,
+			skills: options.skills,
+			promptTemplates: options.promptTemplates,
 			mcpTools: options.mcpManager ? extractMCPToolMetadata(options.mcpManager) : undefined,
 			pythonToolProxy: pythonProxyEnabled,
 			lspToolProxy: Boolean(lspTool),

package/src/task/index.ts

@@ -163,10 +163,14 @@ export class TaskTool implements AgentTool<typeof taskSchema, TaskToolDetails, T
 		const { agent: agentName, context, output: outputSchema, isolated } = params;
 		const isIsolated = isolated === true;
 
-		const isDefaultModelAlias = (value: string | undefined): boolean => {
+		const isDefaultModelAlias = (value: string | string[] | undefined): boolean => {
 			if (!value) return true;
-			const normalized = value.trim().toLowerCase();
-			return normalized === "default" || normalized === "pi/default" || normalized === "omp/default";
+			const values = Array.isArray(value) ? value : [value];
+			if (values.length === 0) return true;
+			return values.every(entry => {
+				const normalized = entry.trim().toLowerCase();
+				return normalized === "default" || normalized === "pi/default" || normalized === "omp/default";
+			});
 		};
 
 		// Validate agent exists
@@ -374,6 +378,9 @@ export class TaskTool implements AgentTool<typeof taskSchema, TaskToolDetails, T
 
 			// Build full prompts with context prepended
 			const tasksWithContext = tasksWithUniqueIds.map(t => renderTemplate(context, t));
+			const contextFiles = this.session.contextFiles;
+			const skills = this.session.skills;
+			const promptTemplates = this.session.promptTemplates;
 
 			// Initialize progress for all tasks
 			for (let i = 0; i < tasksWithContext.length; i++) {
@@ -427,6 +434,9 @@ export class TaskTool implements AgentTool<typeof taskSchema, TaskToolDetails, T
 						modelRegistry: this.session.modelRegistry,
 						settingsManager: this.session.settingsManager,
 						mcpManager: this.session.mcpManager,
+						contextFiles,
+						skills,
+						promptTemplates,
 					});
 				}
 
@@ -467,6 +477,9 @@ export class TaskTool implements AgentTool<typeof taskSchema, TaskToolDetails, T
 						modelRegistry: this.session.modelRegistry,
 						settingsManager: this.session.settingsManager,
 						mcpManager: this.session.mcpManager,
+						contextFiles,
+						skills,
+						promptTemplates,
 					});
 					const patch = await captureDeltaPatch(worktreeDir, baseline);
 					const patchPath = path.join(effectiveArtifactsDir, `${task.id}.patch`);

package/src/task/types.ts

@@ -97,7 +97,7 @@ export interface AgentDefinition {
 	systemPrompt: string;
 	tools?: string[];
 	spawns?: string[] | "*";
-	model?: string;
+	model?: string[];
 	thinkingLevel?: ThinkingLevel;
 	output?: unknown;
 	source: AgentSource;
@@ -122,7 +122,7 @@ export interface AgentProgress {
 	toolCount: number;
 	tokens: number;
 	durationMs: number;
-	modelOverride?: string;
+	modelOverride?: string | string[];
 	/** Data extracted by registered subprocess tool handlers (keyed by tool name) */
 	extractedToolData?: Record<string, unknown[]>;
 }
@@ -142,7 +142,7 @@ export interface SingleResult {
 	truncated: boolean;
 	durationMs: number;
 	tokens: number;
-	modelOverride?: string;
+	modelOverride?: string | string[];
 	error?: string;
 	aborted?: boolean;
 	/** Aggregated usage from the subprocess, accumulated incrementally from message_end events. */

package/src/task/worker-protocol.ts

@@ -1,4 +1,8 @@
 import type { AgentEvent, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
+import type { PromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
+import type { Skill } from "@oh-my-pi/pi-coding-agent/extensibility/skills";
+import type { PreludeHelper } from "@oh-my-pi/pi-coding-agent/ipy/kernel";
+import type { ContextFileEntry } from "@oh-my-pi/pi-coding-agent/tools";
 import type { SerializedModelRegistry } from "../config/model-registry";
 import type { Settings } from "../config/settings-manager";
 import type { SerializedAuthStorage } from "../session/auth-storage";
@@ -100,6 +104,10 @@ export interface SubagentWorkerStartPayload {
 	serializedAuth?: SerializedAuthStorage;
 	serializedModels?: SerializedModelRegistry;
 	serializedSettings?: Settings;
+	pythonPreludeDocs?: PreludeHelper[];
+	contextFiles?: ContextFileEntry[];
+	skills?: Skill[];
+	promptTemplates?: PromptTemplate[];
 	mcpTools?: MCPToolMetadata[];
 	pythonToolProxy?: boolean;
 	lspToolProxy?: boolean;

package/src/task/worker.ts

@@ -14,6 +14,7 @@
  */
 import type { AgentEvent, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { Api, Model } from "@oh-my-pi/pi-ai";
+import { setPreludeDocsCache } from "@oh-my-pi/pi-coding-agent/ipy/executor";
 import { logger, postmortem, untilAborted } from "@oh-my-pi/pi-utils";
 import type { TSchema } from "@sinclair/typebox";
 import { ModelRegistry } from "../config/model-registry";
@@ -527,6 +528,9 @@ async function runTask(runState: RunState, payload: SubagentWorkerStartPayload):
 	let error: string | undefined;
 	let aborted = false;
 	const sessionAbortController = new AbortController();
+	if (payload.pythonPreludeDocs && payload.pythonPreludeDocs.length > 0) {
+		setPreludeDocsCache(payload.pythonPreludeDocs);
+	}
 
 	// Helper to check abort status - throws if aborted to exit early
 	const checkAbort = (): void => {
@@ -589,6 +593,9 @@ async function runTask(runState: RunState, payload: SubagentWorkerStartPayload):
 			? `You will work under this working tree: ${payload.worktree}. CRITICAL: Do not touch the original repository; only make changes inside this worktree.`
 			: "";
 
+		const skipPythonPreflight =
+			payload.pythonToolProxy === true ||
+			(Array.isArray(payload.toolNames) && !payload.toolNames.includes("python"));
 		const { session } = await createAgentSession({
 			cwd: payload.worktree ?? payload.cwd,
 			authStorage,
@@ -599,6 +606,9 @@ async function runTask(runState: RunState, payload: SubagentWorkerStartPayload):
 			toolNames: payload.toolNames,
 			outputSchema: payload.outputSchema,
 			requireCompleteTool: true,
+			contextFiles: payload.contextFiles,
+			skills: payload.skills,
+			promptTemplates: payload.promptTemplates,
 			// Append system prompt (equivalent to CLI's --append-system-prompt)
 			systemPrompt: defaultPrompt =>
 				`${defaultPrompt}\n\n${payload.systemPrompt}\n\n${worktreeNotice}\n\n${completionInstruction}`,
@@ -607,6 +617,7 @@ async function runTask(runState: RunState, payload: SubagentWorkerStartPayload):
 			// Pass spawn restrictions to nested tasks
 			spawns: payload.spawnsEnv,
 			enableLsp: enableLsp && !lspProxyEnabled,
+			skipPythonPreflight,
 			// Disable local MCP discovery if using proxy tools
 			enableMCP: !payload.mcpTools,
 			// Add proxy tools

package/src/tools/index.ts

@@ -1,4 +1,6 @@
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
+import type { PromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
+import type { Skill } from "@oh-my-pi/pi-coding-agent/extensibility/skills";
 import { logger } from "@oh-my-pi/pi-utils";
 import type { BashInterceptorRule } from "../config/settings-manager";
 import type { InternalUrlRouter } from "../internal-urls";
@@ -94,12 +96,26 @@ export { WriteTool, type WriteToolDetails } from "./write";
 /** Tool type (AgentTool from pi-ai) */
 export type Tool = AgentTool<any, any, any>;
 
+export type ContextFileEntry = {
+	path: string;
+	content: string;
+	depth?: number;
+};
+
 /** Session context for tool factories */
 export interface ToolSession {
 	/** Current working directory */
 	cwd: string;
 	/** Whether UI is available */
 	hasUI: boolean;
+	/** Skip Python kernel availability check and warmup */
+	skipPythonPreflight?: boolean;
+	/** Pre-loaded context files (AGENTS.md, etc) */
+	contextFiles?: ContextFileEntry[];
+	/** Pre-loaded skills */
+	skills?: Skill[];
+	/** Pre-loaded prompt templates */
+	promptTemplates?: PromptTemplate[];
 	/** Whether LSP integrations are enabled */
 	enableLsp?: boolean;
 	/** Event bus for tool/extension communication */
@@ -219,10 +235,12 @@ export async function createTools(session: ToolSession, toolNames?: string[]): P
 	const enableLsp = session.enableLsp ?? true;
 	const requestedTools = toolNames && toolNames.length > 0 ? [...new Set(toolNames)] : undefined;
 	const pythonMode = getPythonModeFromEnv() ?? session.settings?.getPythonToolMode?.() ?? "ipy-only";
+	const skipPythonPreflight = session.skipPythonPreflight === true;
 	let pythonAvailable = true;
 	const shouldCheckPython =
+		!skipPythonPreflight &&
 		pythonMode !== "bash-only" &&
-		(requestedTools === undefined || requestedTools.includes("python") || pythonMode === "ipy-only");
+		(requestedTools === undefined || requestedTools.includes("python"));
 	const isTestEnv = process.env.BUN_ENV === "test" || process.env.NODE_ENV === "test";
 	const skipPythonWarm = isTestEnv || process.env.OMP_PYTHON_SKIP_CHECK === "1";
 	if (shouldCheckPython) {