@oh-my-pi/pi-coding-agent 8.4.3 → 8.5.0

package/CHANGELOG.md

@@ -2,6 +2,32 @@
 
 ## [Unreleased]
 
+## [8.5.0] - 2026-01-27
+
+### Added
+- Added subagent support for preloading skill contents into the system prompt instead of listing available skills
+- Added session init entries to capture system prompt, task, tools, and output schema for subagent session logs
+
+### Fixed
+- Reduced Task tool progress update overhead to keep the UI responsive during high-volume streaming output
+- Fixed subagent session logs dropping pre-assistant entries (user/task metadata) before the first assistant response
+
+### Removed
+- Removed enter-plan-mode tool
+## [8.4.5] - 2026-01-26
+
+### Added
+- Model usage tracking to record and retrieve most recently used models
+- Model sorting in selector based on usage history
+
+### Changed
+- Renamed `head_limit` parameter to `limit` in grep and find tools for consistency
+- Added `context` as an alias for the `c` context parameter in grep tool
+- Made hidden files inclusion configurable in find tool via `hidden` parameter (defaults to true)
+- Added support for reading ignore patterns from .gitignore and .ignore files in find tool
+
+### Fixed
+- Respected .gitignore rules when filtering find tool results by glob pattern
 ## [8.4.2] - 2026-01-25
 
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "8.4.3",
+	"version": "8.5.0",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"type": "module",
 	"ompConfig": {
@@ -83,11 +83,11 @@
 		"test": "bun test"
 	},
 	"dependencies": {
-		"@oh-my-pi/omp-stats": "8.4.3",
-		"@oh-my-pi/pi-agent-core": "8.4.3",
-		"@oh-my-pi/pi-ai": "8.4.3",
-		"@oh-my-pi/pi-tui": "8.4.3",
-		"@oh-my-pi/pi-utils": "8.4.3",
+		"@oh-my-pi/omp-stats": "8.5.0",
+		"@oh-my-pi/pi-agent-core": "8.5.0",
+		"@oh-my-pi/pi-ai": "8.5.0",
+		"@oh-my-pi/pi-tui": "8.5.0",
+		"@oh-my-pi/pi-utils": "8.5.0",
 		"@openai/agents": "^0.4.3",
 		"@sinclair/typebox": "^0.34.46",
 		"ajv": "^8.17.1",

package/src/cursor.ts

@@ -170,7 +170,7 @@ export class CursorExecHandlers implements ICursorExecHandlers {
 			context: args.context ?? args.contextBefore ?? args.contextAfter ?? undefined,
 			ignore_case: args.caseInsensitive || undefined,
 			type: args.type || undefined,
-			head_limit: args.headLimit ?? undefined,
+			limit: args.headLimit ?? undefined,
 			multiline: args.multiline || undefined,
 		});
 		return toolResultMessage;

package/src/modes/components/model-selector.ts

@@ -75,7 +75,6 @@ export class ModelSelectorComponent extends Container {
 	private allModels: ModelItem[] = [];
 	private filteredModels: ModelItem[] = [];
 	private selectedIndex: number = 0;
-	private currentModel?: Model<any>;
 	private defaultModel?: Model<any>;
 	private smolModel?: Model<any>;
 	private slowModel?: Model<any>;
@@ -98,7 +97,7 @@ export class ModelSelectorComponent extends Container {
 
 	constructor(
 		tui: TUI,
-		currentModel: Model<any> | undefined,
+		_currentModel: Model<any> | undefined,
 		settingsManager: SettingsManager,
 		modelRegistry: ModelRegistry,
 		scopedModels: ReadonlyArray<ScopedModelItem>,
@@ -109,7 +108,6 @@ export class ModelSelectorComponent extends Container {
 		super();
 
 		this.tui = tui;
-		this.currentModel = currentModel;
 		this.settingsManager = settingsManager;
 		this.modelRegistry = modelRegistry;
 		this.scopedModels = scopedModels;
@@ -213,6 +211,44 @@ export class ModelSelectorComponent extends Container {
 		}
 	}
 
+	private sortModels(models: ModelItem[]): void {
+		// Sort: tagged models (default/smol/slow) first, then MRU, then alphabetical
+		const mruOrder = this.settingsManager.getStorage()?.getModelUsageOrder() ?? [];
+		const mruIndex = new Map(mruOrder.map((key, i) => [key, i]));
+
+		models.sort((a, b) => {
+			const aKey = `${a.provider}/${a.id}`;
+			const bKey = `${b.provider}/${b.id}`;
+
+			// Tagged models first: default (0), smol (1), slow (2), untagged (3)
+			const aTag = modelsAreEqual(this.defaultModel, a.model)
+				? 0
+				: modelsAreEqual(this.smolModel, a.model)
+					? 1
+					: modelsAreEqual(this.slowModel, a.model)
+						? 2
+						: 3;
+			const bTag = modelsAreEqual(this.defaultModel, b.model)
+				? 0
+				: modelsAreEqual(this.smolModel, b.model)
+					? 1
+					: modelsAreEqual(this.slowModel, b.model)
+						? 2
+						: 3;
+			if (aTag !== bTag) return aTag - bTag;
+
+			// Then MRU order (models in mruIndex come before those not in it)
+			const aMru = mruIndex.get(aKey) ?? Number.MAX_SAFE_INTEGER;
+			const bMru = mruIndex.get(bKey) ?? Number.MAX_SAFE_INTEGER;
+			if (aMru !== bMru) return aMru - bMru;
+
+			// Finally alphabetical by provider, then id
+			const providerCmp = a.provider.localeCompare(b.provider);
+			if (providerCmp !== 0) return providerCmp;
+			return a.id.localeCompare(b.id);
+		});
+	}
+
 	private async loadModels(): Promise<void> {
 		let models: ModelItem[];
 
@@ -249,16 +285,7 @@ export class ModelSelectorComponent extends Container {
 			}
 		}
 
-		// Sort: current model first, then by provider, then by id
-		models.sort((a, b) => {
-			const aIsCurrent = modelsAreEqual(this.currentModel, a.model);
-			const bIsCurrent = modelsAreEqual(this.currentModel, b.model);
-			if (aIsCurrent && !bIsCurrent) return -1;
-			if (!aIsCurrent && bIsCurrent) return 1;
-			const providerCmp = a.provider.localeCompare(b.provider);
-			if (providerCmp !== 0) return providerCmp;
-			return a.id.localeCompare(b.id);
-		});
+		this.sortModels(models);
 
 		this.allModels = models;
 		this.filteredModels = models;
@@ -315,7 +342,9 @@ export class ModelSelectorComponent extends Container {
 				this.updateTabBar();
 				baseModels = this.allModels;
 			}
-			this.filteredModels = fuzzyFilter(baseModels, query, ({ id, provider }) => `${id} ${provider}`);
+			const fuzzyMatches = fuzzyFilter(baseModels, query, ({ id, provider }) => `${id} ${provider}`);
+			this.sortModels(fuzzyMatches);
+			this.filteredModels = fuzzyMatches;
 		} else {
 			this.filteredModels = baseModels;
 		}

package/src/modes/components/tool-execution.ts

@@ -558,9 +558,7 @@ export class ToolExecutionComponent extends Container {
 		const context: Record<string, unknown> = {};
 		const normalizeTimeoutSeconds = (value: unknown, maxSeconds: number): number | undefined => {
 			if (typeof value !== "number" || !Number.isFinite(value)) return undefined;
-			let timeoutSec = value > 1000 ? value / 1000 : value;
-			timeoutSec = Math.max(1, Math.min(maxSeconds, timeoutSec));
-			return timeoutSec;
+			return Math.max(1, Math.min(maxSeconds, value));
 		};
 
 		if (this.toolName === "bash" && this.result) {

package/src/modes/controllers/event-controller.ts

@@ -247,12 +247,6 @@ export class EventController {
 						this.ctx.setTodos(details.todos);
 					}
 				}
-				if (event.toolName === "enter_plan_mode" && !event.isError) {
-					const details = event.result.details as import("../../tools").EnterPlanModeDetails | undefined;
-					if (details) {
-						await this.ctx.handleEnterPlanModeTool(details);
-					}
-				}
 				if (event.toolName === "exit_plan_mode" && !event.isError) {
 					const details = event.result.details as ExitPlanModeDetails | undefined;
 					if (details) {

package/src/modes/interactive-mode.ts

@@ -29,7 +29,7 @@ import type { AgentSession, AgentSessionEvent } from "../session/agent-session";
 import { HistoryStorage } from "../session/history-storage";
 import type { SessionContext, SessionManager } from "../session/session-manager";
 import { getRecentSessions } from "../session/session-manager";
-import type { EnterPlanModeDetails, ExitPlanModeDetails } from "../tools";
+import type { ExitPlanModeDetails } from "../tools";
 import { setTerminalTitle } from "../utils/title-generator";
 import type { AssistantMessageComponent } from "./components/assistant-message";
 import type { BashExecutionComponent } from "./components/bash-execution";
@@ -631,25 +631,6 @@ export class InteractiveMode implements InteractiveModeContext {
 		await this.enterPlanMode();
 	}
 
-	async handleEnterPlanModeTool(details: EnterPlanModeDetails): Promise<void> {
-		if (this.planModeEnabled) {
-			this.showWarning("Plan mode is already active.");
-			return;
-		}
-
-		const confirmed = await this.showHookConfirm(
-			"Enter plan mode?",
-			"This enables read-only planning and creates a plan file for approval.",
-		);
-		if (!confirmed) {
-			return;
-		}
-
-		const planFilePath = details.planFilePath || this.getPlanFilePath();
-		this.planModePlanFilePath = planFilePath;
-		await this.enterPlanMode({ planFilePath, workflow: details.workflow });
-	}
-
 	async handleExitPlanModeTool(details: ExitPlanModeDetails): Promise<void> {
 		if (!this.planModeEnabled) {
 			this.showWarning("Plan mode is not active.");

package/src/modes/types.ts

@@ -178,7 +178,6 @@ export interface InteractiveModeContext {
 	openExternalEditor(): void;
 	registerExtensionShortcuts(): void;
 	handlePlanModeCommand(): Promise<void>;
-	handleEnterPlanModeTool(details: import("../tools").EnterPlanModeDetails): Promise<void>;
 	handleExitPlanModeTool(details: ExitPlanModeDetails): Promise<void>;
 
 	// Hook UI methods

package/src/prompts/system/custom-system-prompt.md

@@ -43,6 +43,20 @@ Use the read tool to load a skill's file when the task matches its description.
 {{/list}}
 </available_skills>
 {{/if}}
+{{#if preloadedSkills.length}}
+The following skills are preloaded in full. Apply their instructions directly.
+
+<preloaded_skills>
+{{#list preloadedSkills join="\n"}}
+<skill name="{{name}}">
+<location>skill://{{escapeXml name}}</location>
+<content>
+{{content}}
+</content>
+</skill>
+{{/list}}
+</preloaded_skills>
+{{/if}}
 {{#if rules.length}}
 The following rules define project-specific guidelines and constraints:
 

package/src/prompts/system/plan-mode-active.md

@@ -19,6 +19,10 @@ Create your plan at `{{planFilePath}}`.
 
 The plan file is the ONLY file you may write or edit.
 
+<important>
+Plan execution runs in a fresh context (session cleared). Make the plan file self-contained: include any requirements, decisions, key findings, and remaining todos needed to continue without prior session history.
+</important>
+
 {{#if reentry}}
 ## Re-entry
 

package/src/prompts/system/system-prompt.md

@@ -264,6 +264,18 @@ If a skill covers what you're producing, read it before proceeding.
 {{/list}}
 </skills>
 {{/if}}
+{{#if preloadedSkills.length}}
+<preloaded_skills>
+The following skills are preloaded in full. Apply their instructions directly.
+
+{{#list preloadedSkills join="\n"}}
+<skill name="{{name}}">
+<location>skill://{{escapeXml name}}</location>
+{{content}}
+</skill>
+{{/list}}
+</preloaded_skills>
+{{/if}}
 {{#if rules.length}}
 <rules>
 Rules are local constraints.

package/src/prompts/tools/find.md

@@ -3,12 +3,13 @@
 Fast file pattern matching that works with any codebase size.
 
 <instruction>
-- Supports glob patterns like "**/*.js" or "src/**/*.ts"
+- Supports glob patterns like `**/*.js` or `src/**/*.ts`
+- Includes hidden files by default (use `hidden: false` to exclude)
 - Speculatively perform multiple searches in parallel when potentially useful
 </instruction>
 
 <output>
-Matching file paths sorted by modification time (most recent first). Results truncated at 1000 entries or 50KB.
+Matching file paths sorted by modification time (most recent first). Results truncated at 1000 entries or 50KB (configurable via `limit`).
 </output>
 
 <avoid>

package/src/prompts/tools/grep.md

@@ -16,7 +16,7 @@ Results depend on `output_mode`:
 - `count`: Match counts per file
 
 In `content` mode, truncated at 100 matches by default (configurable via `limit`).
-For `files_with_matches` and `count` modes, use `head_limit` to truncate results.
+For `files_with_matches` and `count` modes, use `limit` to truncate results.
 </output>
 
 <critical>

package/src/prompts/tools/task.md

@@ -38,6 +38,7 @@ Agents with `output="structured"` have a fixed schema enforced via frontmatter;
 		- `id`: Short CamelCase identifier (max 32 chars, e.g., "SessionStore", "LspRefactor")
 		- `description`: Short human-readable description of what the task does
 		- `args`: Object with keys matching `\{{placeholders}}` in context (always include this, even if empty)
+		- `skills`: (optional) Array of skill names to preload into this task's system prompt. When set, the skills index section is omitted and the full SKILL.md contents are embedded.
 - `output`: (optional) JTD schema for structured subagent output (used by the complete tool)
 </parameters>
 

package/src/sdk.ts

@@ -156,6 +156,8 @@ export interface CreateAgentSessionOptions {
 
 	/** Skills. Default: discovered from multiple locations */
 	skills?: Skill[];
+	/** Skills to inline into the system prompt instead of listing available skills. */
+	preloadedSkills?: Skill[];
 	/** Context files (AGENTS.md content). Default: discovered walking up from cwd */
 	contextFiles?: Array<{ path: string; content: string }>;
 	/** Prompt templates. Default: discovered from cwd/.omp/prompts/ + agentDir/prompts/ */
@@ -993,6 +995,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		const defaultPrompt = await buildSystemPromptInternal({
 			cwd,
 			skills,
+			preloadedSkills: options.preloadedSkills,
 			contextFiles,
 			tools,
 			toolNames,
@@ -1007,6 +1010,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			return await buildSystemPromptInternal({
 				cwd,
 				skills,
+				preloadedSkills: options.preloadedSkills,
 				contextFiles,
 				tools,
 				toolNames,

package/src/session/agent-session.ts

@@ -1676,6 +1676,7 @@ export class AgentSession {
 		this.agent.setModel(model);
 		this.sessionManager.appendModelChange(`${model.provider}/${model.id}`, role);
 		this.settingsManager.setModelRole(role, `${model.provider}/${model.id}`);
+		this.settingsManager.getStorage()?.recordModelUsage(`${model.provider}/${model.id}`);
 
 		// Re-clamp thinking level for new model's capabilities
 		this.setThinkingLevel(this.thinkingLevel);
@@ -1694,6 +1695,7 @@ export class AgentSession {
 
 		this.agent.setModel(model);
 		this.sessionManager.appendModelChange(`${model.provider}/${model.id}`, "temporary");
+		this.settingsManager.getStorage()?.recordModelUsage(`${model.provider}/${model.id}`);
 
 		// Re-clamp thinking level for new model's capabilities
 		this.setThinkingLevel(this.thinkingLevel);
@@ -1790,6 +1792,7 @@ export class AgentSession {
 		this.agent.setModel(next.model);
 		this.sessionManager.appendModelChange(`${next.model.provider}/${next.model.id}`);
 		this.settingsManager.setModelRole("default", `${next.model.provider}/${next.model.id}`);
+		this.settingsManager.getStorage()?.recordModelUsage(`${next.model.provider}/${next.model.id}`);
 
 		// Apply thinking level (setThinkingLevel clamps to model capabilities)
 		this.setThinkingLevel(next.thinkingLevel);
@@ -1817,6 +1820,7 @@ export class AgentSession {
 		this.agent.setModel(nextModel);
 		this.sessionManager.appendModelChange(`${nextModel.provider}/${nextModel.id}`);
 		this.settingsManager.setModelRole("default", `${nextModel.provider}/${nextModel.id}`);
+		this.settingsManager.getStorage()?.recordModelUsage(`${nextModel.provider}/${nextModel.id}`);
 
 		// Re-clamp thinking level for new model's capabilities
 		this.setThinkingLevel(this.thinkingLevel);

package/src/session/agent-storage.ts

@@ -23,6 +23,12 @@ type AuthRow = {
 	data: string;
 };
 
+/** Row shape for model_usage table queries */
+type ModelUsageRow = {
+	model_key: string;
+	last_used_at: number;
+};
+
 /**
  * Auth credential with database row ID for updates/deletes.
  * Wraps AuthCredential with storage metadata.
@@ -34,7 +40,7 @@ export interface StoredAuthCredential {
 }
 
 /** Bump when schema changes require migration */
-const SCHEMA_VERSION = 2;
+const SCHEMA_VERSION = 3;
 
 /**
  * Type guard for plain objects.
@@ -126,6 +132,9 @@ export class AgentStorage {
 	private deleteAuthStmt: Statement;
 	private deleteAuthByProviderStmt: Statement;
 	private countAuthStmt: Statement;
+	private upsertModelUsageStmt: Statement;
+	private listModelUsageStmt: Statement;
+	private modelUsageCache: string[] | null = null;
 
 	private constructor(dbPath: string) {
 		this.ensureDir(dbPath);
@@ -157,6 +166,13 @@ export class AgentStorage {
 		this.deleteAuthStmt = this.db.prepare("DELETE FROM auth_credentials WHERE id = ?");
 		this.deleteAuthByProviderStmt = this.db.prepare("DELETE FROM auth_credentials WHERE provider = ?");
 		this.countAuthStmt = this.db.prepare("SELECT COUNT(*) as count FROM auth_credentials");
+
+		this.upsertModelUsageStmt = this.db.prepare(
+			"INSERT INTO model_usage (model_key, last_used_at) VALUES (?, unixepoch()) ON CONFLICT(model_key) DO UPDATE SET last_used_at = unixepoch()",
+		);
+		this.listModelUsageStmt = this.db.prepare(
+			"SELECT model_key, last_used_at FROM model_usage ORDER BY last_used_at DESC",
+		);
 	}
 
 	/**
@@ -186,6 +202,11 @@ CREATE TABLE IF NOT EXISTS cache (
 );
 CREATE INDEX IF NOT EXISTS idx_cache_expires ON cache(expires_at);
 
+CREATE TABLE IF NOT EXISTS model_usage (
+	model_key TEXT PRIMARY KEY,
+	last_used_at INTEGER NOT NULL DEFAULT (unixepoch())
+);
+
 CREATE TABLE IF NOT EXISTS schema_version (version INTEGER PRIMARY KEY);
 `);
 
@@ -357,6 +378,38 @@ CREATE TABLE settings (
 		}
 	}
 
+	/**
+	 * Records model usage, updating the last-used timestamp.
+	 * @param modelKey - Model key in "provider/modelId" format
+	 */
+	recordModelUsage(modelKey: string): void {
+		try {
+			this.upsertModelUsageStmt.run(modelKey);
+			this.modelUsageCache = null;
+		} catch (error) {
+			logger.warn("AgentStorage failed to record model usage", { modelKey, error: String(error) });
+		}
+	}
+
+	/**
+	 * Gets model keys ordered by most recently used.
+	 * Results are cached until recordModelUsage is called.
+	 * @returns Array of model keys ("provider/modelId") in MRU order
+	 */
+	getModelUsageOrder(): string[] {
+		if (this.modelUsageCache) {
+			return this.modelUsageCache;
+		}
+		try {
+			const rows = this.listModelUsageStmt.all() as ModelUsageRow[];
+			this.modelUsageCache = rows.map(row => row.model_key);
+			return this.modelUsageCache;
+		} catch (error) {
+			logger.warn("AgentStorage failed to get model usage order", { error: String(error) });
+			return [];
+		}
+	}
+
 	/**
 	 * Checks if any auth credentials exist in storage.
 	 * @returns True if at least one credential is stored

package/src/session/session-manager.ts

@@ -110,6 +110,19 @@ export interface TtsrInjectionEntry extends SessionEntryBase {
 	injectedRules: string[];
 }
 
+/** Session init entry - captures initial context for subagent sessions (debugging/replay). */
+export interface SessionInitEntry extends SessionEntryBase {
+	type: "session_init";
+	/** Full system prompt sent to the model */
+	systemPrompt: string;
+	/** Initial task/user message */
+	task: string;
+	/** Tools available to the agent */
+	tools: string[];
+	/** Output schema if structured output was requested */
+	outputSchema?: unknown;
+}
+
 /**
  * Custom message entry for extensions to inject messages into LLM context.
  * Use customType to identify your extension's entries.
@@ -140,7 +153,8 @@ export type SessionEntry =
 	| CustomEntry
 	| CustomMessageEntry
 	| LabelEntry
-	| TtsrInjectionEntry;
+	| TtsrInjectionEntry
+	| SessionInitEntry;
 
 /** Raw file entry (includes header) */
 export type FileEntry = SessionHeader | SessionEntry;
@@ -1263,7 +1277,7 @@ export class SessionManager {
 		if (this.persistError) throw this.persistError;
 
 		const hasAssistant = this.fileEntries.some(e => e.type === "message" && e.message.role === "assistant");
-		if (!hasAssistant) return;
+		if (!hasAssistant && !this.flushed) return;
 
 		if (!this.flushed) {
 			this.flushed = true;
@@ -1368,6 +1382,19 @@ export class SessionManager {
 		return entry.id;
 	}
 
+	/** Append session init metadata (for subagent debugging/replay). Returns entry id. */
+	appendSessionInit(init: { systemPrompt: string; task: string; tools: string[]; outputSchema?: unknown }): string {
+		const entry: SessionInitEntry = {
+			type: "session_init",
+			id: generateId(this.byId),
+			parentId: this.leafId,
+			timestamp: new Date().toISOString(),
+			...init,
+		};
+		this._appendEntry(entry);
+		return entry.id;
+	}
+
 	/** Append a compaction summary as child of current leaf, then advance leaf. Returns entry id. */
 	appendCompaction<T = unknown>(
 		summary: string,

package/src/system-prompt.ts

@@ -23,6 +23,24 @@ interface GitContext {
 	commits: string;
 }
 
+type PreloadedSkill = { name: string; content: string };
+
+async function loadPreloadedSkillContents(preloadedSkills: Skill[]): Promise<PreloadedSkill[]> {
+	const contents = await Promise.all(
+		preloadedSkills.map(async skill => {
+			try {
+				const content = await Bun.file(skill.filePath).text();
+				return { name: skill.name, content };
+			} catch (err) {
+				const message = err instanceof Error ? err.message : String(err);
+				throw new Error(`Failed to load skill "${skill.name}" from ${skill.filePath}: ${message}`);
+			}
+		}),
+	);
+
+	return contents;
+}
+
 /**
  * Load git context for the system prompt.
  * Returns structured git data or null if not in a git repo.
@@ -643,6 +661,8 @@ export interface BuildSystemPromptOptions {
 	contextFiles?: Array<{ path: string; content: string; depth?: number }>;
 	/** Pre-loaded skills (skips discovery if provided). */
 	skills?: Skill[];
+	/** Skills to inline into the system prompt instead of listing available skills. */
+	preloadedSkills?: Skill[];
 	/** Pre-loaded rulebook rules (rules with descriptions, excluding TTSR and always-apply). */
 	rules?: Array<{ name: string; description?: string; path: string; globs?: string[] }>;
 }
@@ -662,6 +682,7 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		cwd,
 		contextFiles: providedContextFiles,
 		skills: providedSkills,
+		preloadedSkills: providedPreloadedSkills,
 		rules,
 	} = options;
 	const resolvedCwd = cwd ?? process.cwd();
@@ -707,13 +728,15 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 	const skills =
 		providedSkills ??
 		(skillsSettings?.enabled !== false ? (await loadSkills({ ...skillsSettings, cwd: resolvedCwd })).skills : []);
+	const preloadedSkills = providedPreloadedSkills;
+	const preloadedSkillContents = preloadedSkills ? await loadPreloadedSkillContents(preloadedSkills) : [];
 
 	// Get git context
 	const git = await loadGitContext(resolvedCwd);
 
 	// Filter skills to only include those with read tool
 	const hasRead = tools?.has("read");
-	const filteredSkills = hasRead ? skills : [];
+	const filteredSkills = preloadedSkills === undefined && hasRead ? skills : [];
 
 	if (resolvedCustomPrompt) {
 		return renderPromptTemplate(customSystemPromptTemplate, {
@@ -724,6 +747,7 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 			agentsMdSearch,
 			git,
 			skills: filteredSkills,
+			preloadedSkills: preloadedSkillContents,
 			rules: rules ?? [],
 			dateTime,
 			cwd: resolvedCwd,
@@ -738,6 +762,7 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		agentsMdSearch,
 		git,
 		skills: filteredSkills,
+		preloadedSkills: preloadedSkillContents,
 		rules: rules ?? [],
 		dateTime,
 		cwd: resolvedCwd,