@oh-my-pi/pi-coding-agent 4.0.1 → 4.2.0

package/src/core/title-generator.ts

@@ -4,12 +4,13 @@
 
 import type { Api, Model } from "@oh-my-pi/pi-ai";
 import { completeSimple } from "@oh-my-pi/pi-ai";
-import titleSystemPrompt from "../prompts/title-system.md" with { type: "text" };
+import titleSystemPrompt from "../prompts/system/title-system.md" with { type: "text" };
 import { logger } from "./logger";
 import type { ModelRegistry } from "./model-registry";
 import { parseModelString, SMOL_MODEL_PRIORITY } from "./model-resolver";
+import { renderPromptTemplate } from "./prompt-templates";
 
-const TITLE_SYSTEM_PROMPT = titleSystemPrompt;
+const TITLE_SYSTEM_PROMPT = renderPromptTemplate(titleSystemPrompt);
 
 const MAX_INPUT_CHARS = 2000;
 

package/src/core/tools/ask.ts

@@ -22,6 +22,7 @@ import { Type } from "@sinclair/typebox";
 import { type Theme, theme } from "../../modes/interactive/theme/theme";
 import askDescription from "../../prompts/tools/ask.md" with { type: "text" };
 import type { RenderResultOptions } from "../custom-tools/types";
+import { renderPromptTemplate } from "../prompt-templates";
 import type { ToolSession } from "./index";
 import { createToolUIKit } from "./render-utils";
 
@@ -75,7 +76,7 @@ export function createAskTool(session: ToolSession): null | AgentTool<typeof ask
 	return {
 		name: "ask",
 		label: "Ask",
-		description: askDescription,
+		description: renderPromptTemplate(askDescription),
 		parameters: askSchema,
 
 		async execute(
@@ -201,7 +202,6 @@ export function createAskTool(session: ToolSession): null | AgentTool<typeof ask
 export const askTool = createAskTool({
 	cwd: process.cwd(),
 	hasUI: false,
-	rulebookRules: [],
 	getSessionFile: () => null,
 	getSessionSpawns: () => "*",
 });

package/src/core/tools/bash.ts

@@ -8,6 +8,7 @@ import type { Theme } from "../../modes/interactive/theme/theme";
 import bashDescription from "../../prompts/tools/bash.md" with { type: "text" };
 import { type BashExecutorOptions, executeBash, executeBashWithOperations } from "../bash-executor";
 import type { RenderResultOptions } from "../custom-tools/types";
+import { renderPromptTemplate } from "../prompt-templates";
 import { checkBashInterception, checkSimpleLsInterception } from "./bash-interceptor";
 import type { ToolSession } from "./index";
 import { resolveToCwd } from "./path-utils";
@@ -52,7 +53,7 @@ export function createBashTool(session: ToolSession, options?: BashToolOptions):
 	return {
 		name: "bash",
 		label: "Bash",
-		description: bashDescription,
+		description: renderPromptTemplate(bashDescription),
 		parameters: bashSchema,
 		execute: async (
 			_toolCallId: string,

package/src/core/tools/calculator.ts

@@ -5,6 +5,7 @@ import { Type } from "@sinclair/typebox";
 import type { Theme } from "../../modes/interactive/theme/theme";
 import calculatorDescription from "../../prompts/tools/calculator.md" with { type: "text" };
 import type { RenderResultOptions } from "../custom-tools/types";
+import { renderPromptTemplate } from "../prompt-templates";
 import { untilAborted } from "../utils";
 import type { ToolSession } from "./index";
 import {
@@ -393,7 +394,7 @@ export function createCalculatorTool(_session: ToolSession): AgentTool<typeof ca
 	return {
 		name: "calc",
 		label: "Calc",
-		description: calculatorDescription,
+		description: renderPromptTemplate(calculatorDescription),
 		parameters: calculatorSchema,
 		execute: async (
 			_toolCallId: string,

package/src/core/tools/edit.ts

@@ -5,6 +5,7 @@ import { Type } from "@sinclair/typebox";
 import { getLanguageFromPath, type Theme } from "../../modes/interactive/theme/theme";
 import editDescription from "../../prompts/tools/edit.md" with { type: "text" };
 import type { RenderResultOptions } from "../custom-tools/types";
+import { renderPromptTemplate } from "../prompt-templates";
 import {
 	DEFAULT_FUZZY_THRESHOLD,
 	detectLineEnding,
@@ -48,7 +49,7 @@ export function createEditTool(session: ToolSession): AgentTool<typeof editSchem
 	return {
 		name: "edit",
 		label: "Edit",
-		description: editDescription,
+		description: renderPromptTemplate(editDescription),
 		parameters: editSchema,
 		execute: async (
 			_toolCallId: string,

package/src/core/tools/find.ts

@@ -7,6 +7,7 @@ import { getLanguageFromPath, type Theme } from "../../modes/interactive/theme/t
 import findDescription from "../../prompts/tools/find.md" with { type: "text" };
 import { ensureTool } from "../../utils/tools-manager";
 import type { RenderResultOptions } from "../custom-tools/types";
+import { renderPromptTemplate } from "../prompt-templates";
 import { ScopeSignal, untilAborted } from "../utils";
 import type { ToolSession } from "./index";
 import { resolveToCwd } from "./path-utils";
@@ -113,7 +114,7 @@ export function createFindTool(session: ToolSession, options?: FindToolOptions):
 	return {
 		name: "find",
 		label: "Find",
-		description: findDescription,
+		description: renderPromptTemplate(findDescription),
 		parameters: findSchema,
 		execute: async (
 			_toolCallId: string,

package/src/core/tools/gemini-image.ts

@@ -5,6 +5,7 @@ import { nanoid } from "nanoid";
 import geminiImageDescription from "../../prompts/tools/gemini-image.md" with { type: "text" };
 import { detectSupportedImageMimeTypeFromFile } from "../../utils/mime";
 import type { CustomTool } from "../custom-tools/types";
+import { renderPromptTemplate } from "../prompt-templates";
 import { untilAborted } from "../utils";
 import { resolveReadPath } from "./path-utils";
 import { getEnv } from "./web-search/auth";
@@ -367,7 +368,7 @@ function createRequestSignal(signal: AbortSignal | undefined, timeoutSeconds: nu
 export const geminiImageTool: CustomTool<typeof geminiImageSchema, GeminiImageToolDetails> = {
 	name: "generate_image",
 	label: "GenerateImage",
-	description: geminiImageDescription,
+	description: renderPromptTemplate(geminiImageDescription),
 	parameters: geminiImageSchema,
 	async execute(_toolCallId, params, _onUpdate, ctx, signal) {
 		return untilAborted(signal, async () => {

package/src/core/tools/git.ts

@@ -2,6 +2,7 @@ import type { AgentTool } from "@oh-my-pi/pi-agent-core";
 import { type GitParams, gitTool as gitToolCore, type ToolResponse } from "@oh-my-pi/pi-git-tool";
 import { type Static, Type } from "@sinclair/typebox";
 import gitDescription from "../../prompts/tools/git.md" with { type: "text" };
+import { renderPromptTemplate } from "../prompt-templates";
 import type { ToolSession } from "./index";
 
 const gitSchema = Type.Object({
@@ -200,7 +201,7 @@ export function createGitTool(session: ToolSession): AgentTool<typeof gitSchema,
 	return {
 		name: "git",
 		label: "Git",
-		description: gitDescription,
+		description: renderPromptTemplate(gitDescription),
 		parameters: gitSchema,
 		execute: async (_toolCallId, params: Static<typeof gitSchema>, _signal?: AbortSignal) => {
 			if (params.operation === "commit" && !params.message) {
@@ -224,7 +225,6 @@ export function createGitTool(session: ToolSession): AgentTool<typeof gitSchema,
 export const gitTool = createGitTool({
 	cwd: process.cwd(),
 	hasUI: false,
-	rulebookRules: [],
 	getSessionFile: () => null,
 	getSessionSpawns: () => null,
 })!;

package/src/core/tools/grep.ts

@@ -8,6 +8,7 @@ import { getLanguageFromPath, type Theme } from "../../modes/interactive/theme/t
 import grepDescription from "../../prompts/tools/grep.md" with { type: "text" };
 import { ensureTool } from "../../utils/tools-manager";
 import type { RenderResultOptions } from "../custom-tools/types";
+import { renderPromptTemplate } from "../prompt-templates";
 import { ScopeSignal, untilAborted } from "../utils";
 import type { ToolSession } from "./index";
 import { resolveToCwd } from "./path-utils";
@@ -96,7 +97,7 @@ export function createGrepTool(session: ToolSession, options?: GrepToolOptions):
 	return {
 		name: "grep",
 		label: "Grep",
-		description: grepDescription,
+		description: renderPromptTemplate(grepDescription),
 		parameters: grepSchema,
 		execute: async (
 			_toolCallId: string,

package/src/core/tools/index.test.ts

@@ -5,7 +5,6 @@ function createTestSession(overrides: Partial<ToolSession> = {}): ToolSession {
 	return {
 		cwd: "/tmp/test",
 		hasUI: false,
-		rulebookRules: [],
 		getSessionFile: () => null,
 		getSessionSpawns: () => "*",
 		...overrides,
@@ -75,32 +74,6 @@ describe("createTools", () => {
 		expect(names).toContain("ask");
 	});
 
-	it("excludes rulebook tool when no rules provided", async () => {
-		const session = createTestSession({ rulebookRules: [] });
-		const tools = await createTools(session);
-		const names = tools.map((t) => t.name);
-
-		expect(names).not.toContain("rulebook");
-	});
-
-	it("includes rulebook tool when rules provided", async () => {
-		const session = createTestSession({
-			rulebookRules: [
-				{
-					path: "/test/rule.md",
-					name: "Test Rule",
-					content: "Test content",
-					description: "A test rule",
-					_source: { provider: "test", providerName: "Test", path: "/test", level: "project" },
-				},
-			],
-		});
-		const tools = await createTools(session);
-		const names = tools.map((t) => t.name);
-
-		expect(names).toContain("rulebook");
-	});
-
 	it("excludes git tool when disabled in settings", async () => {
 		const session = createTestSession({
 			settings: {
@@ -174,7 +147,6 @@ describe("createTools", () => {
 			"notebook",
 			"output",
 			"read",
-			"rulebook",
 			"task",
 			"web_fetch",
 			"web_search",

package/src/core/tools/index.ts

@@ -26,7 +26,6 @@ export { createNotebookTool, type NotebookToolDetails } from "./notebook";
 export { createOutputTool, type OutputToolDetails } from "./output";
 export { createReadTool, type ReadToolDetails } from "./read";
 export { reportFindingTool, type SubmitReviewDetails } from "./review";
-export { filterRulebookRules, formatRulesForPrompt, type RulebookToolDetails } from "./rulebook";
 export { createSshTool, type SSHToolDetails } from "./ssh";
 export { BUNDLED_AGENTS, createTaskTool, taskTool } from "./task/index";
 export {
@@ -62,7 +61,6 @@ export {
 export { createWriteTool, type WriteToolDetails } from "./write";
 
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
-import type { Rule } from "../../capability/rule";
 import type { EventBus } from "../event-bus";
 import type { BashInterceptorRule } from "../settings-manager";
 import { createAskTool } from "./ask";
@@ -79,7 +77,6 @@ import { createNotebookTool } from "./notebook";
 import { createOutputTool } from "./output";
 import { createReadTool } from "./read";
 import { reportFindingTool } from "./review";
-import { createRulebookTool } from "./rulebook";
 import { createSshTool } from "./ssh";
 import { createTaskTool } from "./task/index";
 import { createWebFetchTool } from "./web-fetch";
@@ -95,8 +92,6 @@ export interface ToolSession {
 	cwd: string;
 	/** Whether UI is available */
 	hasUI: boolean;
-	/** Rulebook rules */
-	rulebookRules: Rule[];
 	/** Event bus for tool/extension communication */
 	eventBus?: EventBus;
 	/** Output schema for structured completion (subagents) */
@@ -141,7 +136,6 @@ export const BUILTIN_TOOLS: Record<string, ToolFactory> = {
 	notebook: createNotebookTool,
 	output: createOutputTool,
 	read: createReadTool,
-	rulebook: createRulebookTool,
 	task: createTaskTool,
 	web_fetch: createWebFetchTool,
 	web_search: createWebSearchTool,

package/src/core/tools/lsp/index.ts

@@ -6,6 +6,7 @@ import type { BunFile } from "bun";
 import { type Theme, theme } from "../../../modes/interactive/theme/theme";
 import lspDescription from "../../../prompts/tools/lsp.md" with { type: "text" };
 import { logger } from "../../logger";
+import { renderPromptTemplate } from "../../prompt-templates";
 import { once, untilAborted } from "../../utils";
 import type { ToolSession } from "../index";
 import { resolveToCwd } from "../path-utils";
@@ -737,7 +738,7 @@ export function createLspTool(session: ToolSession): AgentTool<typeof lspSchema,
 	return {
 		name: "lsp",
 		label: "LSP",
-		description: lspDescription,
+		description: renderPromptTemplate(lspDescription),
 		parameters: lspSchema,
 		renderCall,
 		renderResult,

package/src/core/tools/output.ts

@@ -14,6 +14,7 @@ import { Type } from "@sinclair/typebox";
 import type { Theme } from "../../modes/interactive/theme/theme";
 import outputDescription from "../../prompts/tools/output.md" with { type: "text" };
 import type { RenderResultOptions } from "../custom-tools/types";
+import { renderPromptTemplate } from "../prompt-templates";
 import type { ToolSession } from "./index";
 import {
 	formatCount,
@@ -236,7 +237,7 @@ export function createOutputTool(session: ToolSession): AgentTool<typeof outputS
 	return {
 		name: "output",
 		label: "Output",
-		description: outputDescription,
+		description: renderPromptTemplate(outputDescription),
 		parameters: outputSchema,
 		execute: async (
 			_toolCallId: string,

package/src/core/tools/read.ts

@@ -12,6 +12,7 @@ import { formatDimensionNote, resizeImage } from "../../utils/image-resize";
 import { detectSupportedImageMimeTypeFromFile } from "../../utils/mime";
 import { ensureTool } from "../../utils/tools-manager";
 import type { RenderResultOptions } from "../custom-tools/types";
+import { renderPromptTemplate } from "../prompt-templates";
 import type { ToolSession } from "../sdk";
 import { ScopeSignal, untilAborted } from "../utils";
 import { createLsTool } from "./ls";
@@ -429,7 +430,9 @@ export function createReadTool(session: ToolSession): AgentTool<typeof readSchem
 	return {
 		name: "read",
 		label: "Read",
-		description: readDescription.replace("{{DEFAULT_MAX_LINES}}", String(DEFAULT_MAX_LINES)),
+		description: renderPromptTemplate(readDescription, {
+			DEFAULT_MAX_LINES: String(DEFAULT_MAX_LINES),
+		}),
 		parameters: readSchema,
 		execute: async (
 			toolCallId: string,

package/src/core/tools/ssh.ts

@@ -8,6 +8,7 @@ import { loadSync } from "../../discovery/index";
 import type { Theme } from "../../modes/interactive/theme/theme";
 import sshDescriptionBase from "../../prompts/tools/ssh.md" with { type: "text" };
 import type { RenderResultOptions } from "../custom-tools/types";
+import { renderPromptTemplate } from "../prompt-templates";
 import type { SSHHostInfo } from "../ssh/connection-manager";
 import { ensureHostInfo, getHostInfoForHost } from "../ssh/connection-manager";
 import { executeSSH } from "../ssh/ssh-executor";
@@ -54,11 +55,12 @@ function formatHostEntry(host: SSHHost): string {
 }
 
 function formatDescription(hosts: SSHHost[]): string {
+	const baseDescription = renderPromptTemplate(sshDescriptionBase);
 	if (hosts.length === 0) {
-		return sshDescriptionBase;
+		return baseDescription;
 	}
 	const hostList = hosts.map(formatHostEntry).join("\n");
-	return `${sshDescriptionBase}\n\nAvailable hosts:\n${hostList}`;
+	return `${baseDescription}\n\nAvailable hosts:\n${hostList}`;
 }
 
 function quoteRemotePath(value: string): string {

package/src/core/tools/task/agents.ts

@@ -4,47 +4,73 @@
  * Agents are embedded at build time via Bun's import with { type: "text" }.
  */
 
+import exploreMd from "../../../prompts/agents/explore.md" with { type: "text" };
 // Embed agent markdown files at build time
-import exploreMd from "../../../prompts/explore.md" with { type: "text" };
-import planMd from "../../../prompts/plan.md" with { type: "text" };
-import reviewerMd from "../../../prompts/reviewer.md" with { type: "text" };
-import taskMd from "../../../prompts/task.md" with { type: "text" };
+import agentFrontmatterTemplate from "../../../prompts/agents/frontmatter.md" with { type: "text" };
+import planMd from "../../../prompts/agents/plan.md" with { type: "text" };
+import reviewerMd from "../../../prompts/agents/reviewer.md" with { type: "text" };
+import taskMd from "../../../prompts/agents/task.md" with { type: "text" };
+import { renderPromptTemplate } from "../../prompt-templates";
 import type { AgentDefinition, AgentSource } from "./types";
 
-const EMBEDDED_AGENTS: { name: string; content: string }[] = [
-	{ name: "explore.md", content: exploreMd },
-	{ name: "plan.md", content: planMd },
-	{ name: "reviewer.md", content: reviewerMd },
+interface AgentFrontmatter {
+	name: string;
+	description: string;
+	spawns?: string;
+	model?: string;
+}
+
+interface EmbeddedAgentDef {
+	fileName: string;
+	frontmatter?: AgentFrontmatter;
+	template: string;
+}
+
+function buildAgentContent(def: EmbeddedAgentDef): string {
+	const body = renderPromptTemplate(def.template);
+	if (!def.frontmatter) return body;
+	return renderPromptTemplate(agentFrontmatterTemplate, { ...def.frontmatter, body });
+}
+
+const EMBEDDED_AGENT_DEFS: EmbeddedAgentDef[] = [
+	{ fileName: "explore.md", template: exploreMd },
+	{ fileName: "plan.md", template: planMd },
+	{ fileName: "reviewer.md", template: reviewerMd },
 	{
-		name: "task.md",
-		content: `---
-name: task
-description: General-purpose subagent with full capabilities for delegated multi-step tasks
-spawns: explore
-model: default
----
-${taskMd}`,
+		fileName: "task.md",
+		frontmatter: {
+			name: "task",
+			description: "General-purpose subagent with full capabilities for delegated multi-step tasks",
+			spawns: "explore",
+			model: "default",
+		},
+		template: taskMd,
 	},
 	{
-		name: "quick_task.md",
-		content: `---
-name: quick_task
-description: Quick task for fast execution
-model: pi/smol
----
-${taskMd}`,
+		fileName: "quick_task.md",
+		frontmatter: {
+			name: "quick_task",
+			description: "Quick task for fast execution",
+			model: "pi/smol",
+		},
+		template: taskMd,
 	},
 	{
-		name: "deep_task.md",
-		content: `---
-name: deep_task
-description: Deep task for comprehensive reasoning
-model: pi/slow
----
-${taskMd}`,
+		fileName: "deep_task.md",
+		frontmatter: {
+			name: "deep_task",
+			description: "Deep task for comprehensive reasoning",
+			model: "pi/slow",
+		},
+		template: taskMd,
 	},
 ];
 
+const EMBEDDED_AGENTS: { name: string; content: string }[] = EMBEDDED_AGENT_DEFS.map((def) => ({
+	name: def.fileName,
+	content: buildAgentContent(def),
+}));
+
 /**
  * Parse YAML frontmatter from markdown content.
  */

package/src/core/tools/task/commands.ts

@@ -9,16 +9,17 @@ import { type SlashCommand, slashCommandCapability } from "../../../capability/s
 import { loadSync } from "../../../discovery";
 
 // Embed command markdown files at build time
-import architectPlanMd from "../../../prompts/architect-plan.md" with { type: "text" };
-import implementMd from "../../../prompts/implement.md" with { type: "text" };
-import implementWithCriticMd from "../../../prompts/implement-with-critic.md" with { type: "text" };
-import initMd from "../../../prompts/init.md" with { type: "text" };
+import architectPlanMd from "../../../prompts/agents/architect-plan.md" with { type: "text" };
+import implementMd from "../../../prompts/agents/implement.md" with { type: "text" };
+import implementWithCriticMd from "../../../prompts/agents/implement-with-critic.md" with { type: "text" };
+import initMd from "../../../prompts/agents/init.md" with { type: "text" };
+import { renderPromptTemplate } from "../../prompt-templates";
 
 const EMBEDDED_COMMANDS: { name: string; content: string }[] = [
-	{ name: "architect-plan.md", content: architectPlanMd },
-	{ name: "implement-with-critic.md", content: implementWithCriticMd },
-	{ name: "implement.md", content: implementMd },
-	{ name: "init.md", content: initMd },
+	{ name: "architect-plan.md", content: renderPromptTemplate(architectPlanMd) },
+	{ name: "implement-with-critic.md", content: renderPromptTemplate(implementWithCriticMd) },
+	{ name: "implement.md", content: renderPromptTemplate(implementMd) },
+	{ name: "init.md", content: renderPromptTemplate(initMd) },
 ];
 
 export const EMBEDDED_COMMAND_TEMPLATES: ReadonlyArray<{ name: string; content: string }> = EMBEDDED_COMMANDS;

package/src/core/tools/task/index.ts

@@ -17,6 +17,7 @@ import type { AgentTool } from "@oh-my-pi/pi-agent-core";
 import type { Usage } from "@oh-my-pi/pi-ai";
 import type { Theme } from "../../../modes/interactive/theme/theme";
 import taskDescriptionTemplate from "../../../prompts/tools/task.md" with { type: "text" };
+import { renderPromptTemplate } from "../../prompt-templates";
 import { formatDuration } from "../render-utils";
 import { cleanupTempDir, createTempArtifactsDir, getArtifactsDir } from "./artifacts";
 import { discoverAgents, getAgent } from "./discovery";
@@ -95,21 +96,12 @@ export { taskSchema } from "./types";
 async function buildDescription(cwd: string): Promise<string> {
 	const { agents } = await discoverAgents(cwd);
 
-	// Build agents list
-	const agentLines: string[] = [];
-	for (const agent of agents.slice(0, MAX_AGENTS_IN_DESCRIPTION)) {
-		const tools = agent.tools?.join(", ") || "All tools";
-		agentLines.push(`- ${agent.name}: ${agent.description} (Tools: ${tools})`);
-	}
-	if (agents.length > MAX_AGENTS_IN_DESCRIPTION) {
-		agentLines.push(`  ...and ${agents.length - MAX_AGENTS_IN_DESCRIPTION} more agents`);
-	}
-
-	// Fill template placeholders
-	return taskDescriptionTemplate
-		.replace("{{AGENTS_LIST}}", agentLines.join("\n"))
-		.replace("{{MAX_PARALLEL_TASKS}}", String(MAX_PARALLEL_TASKS))
-		.replace("{{MAX_CONCURRENCY}}", String(MAX_CONCURRENCY));
+	return renderPromptTemplate(taskDescriptionTemplate, {
+		agents: agents.slice(0, MAX_AGENTS_IN_DESCRIPTION),
+		moreAgents: agents.length > MAX_AGENTS_IN_DESCRIPTION ? agents.length - MAX_AGENTS_IN_DESCRIPTION : 0,
+		MAX_PARALLEL_TASKS,
+		MAX_CONCURRENCY,
+	});
 }
 
 /**

package/src/core/tools/web-fetch.ts

@@ -10,6 +10,7 @@ import { type Theme, theme } from "../../modes/interactive/theme/theme";
 import webFetchDescription from "../../prompts/tools/web-fetch.md" with { type: "text" };
 import { ensureTool } from "../../utils/tools-manager";
 import type { RenderResultOptions } from "../custom-tools/types";
+import { renderPromptTemplate } from "../prompt-templates";
 import type { ToolSession } from "./index";
 import { specialHandlers } from "./web-scrapers/index";
 import type { RenderResult } from "./web-scrapers/types";
@@ -836,7 +837,7 @@ export function createWebFetchTool(_session: ToolSession): AgentTool<typeof webF
 	return {
 		name: "web_fetch",
 		label: "Web Fetch",
-		description: webFetchDescription,
+		description: renderPromptTemplate(webFetchDescription),
 		parameters: webFetchSchema,
 		execute: async (
 			_toolCallId: string,