@oh-my-pi/pi-coding-agent 13.19.0 → 14.0.3

package/src/exec/idle-timeout-watchdog.ts

@@ -0,0 +1,126 @@
+export type ExecutionAbortReason = "idle-timeout" | "signal";
+
+export interface IdleTimeoutWatchdogOptions {
+	timeoutMs?: number;
+	signal?: AbortSignal;
+	hardTimeoutGraceMs: number;
+	onAbort?: (reason: ExecutionAbortReason) => void;
+}
+
+export class IdleTimeoutWatchdog {
+	#abortController = new AbortController();
+	#abortReason?: ExecutionAbortReason;
+	#hardTimeoutDeferred = Promise.withResolvers<"hard-timeout">();
+	#hardTimeoutGraceMs: number;
+	#hardTimeoutTimer?: NodeJS.Timeout;
+	#idleTimer?: NodeJS.Timeout;
+	#onAbort?: (reason: ExecutionAbortReason) => void;
+	#signal?: AbortSignal;
+	#signalAbortHandler?: () => void;
+	#timeoutMs?: number;
+
+	constructor(options: IdleTimeoutWatchdogOptions) {
+		this.#timeoutMs = options.timeoutMs;
+		this.#hardTimeoutGraceMs = options.hardTimeoutGraceMs;
+		this.#onAbort = options.onAbort;
+		this.#signal = options.signal;
+
+		if (this.#signal) {
+			if (this.#signal.aborted) {
+				this.#abort("signal");
+				return;
+			}
+
+			this.#signalAbortHandler = () => {
+				this.#abort("signal");
+			};
+			this.#signal.addEventListener("abort", this.#signalAbortHandler, { once: true });
+		}
+
+		this.touch();
+	}
+
+	get abortedBySignal(): boolean {
+		return this.#abortReason === "signal";
+	}
+
+	get hardTimeoutPromise(): Promise<"hard-timeout"> {
+		return this.#hardTimeoutDeferred.promise;
+	}
+
+	get signal(): AbortSignal {
+		return this.#abortController.signal;
+	}
+
+	get timedOut(): boolean {
+		return this.#abortReason === "idle-timeout";
+	}
+
+	touch(): void {
+		if (this.#abortReason || this.#timeoutMs === undefined || this.#timeoutMs <= 0) {
+			return;
+		}
+
+		if (this.#idleTimer) {
+			clearTimeout(this.#idleTimer);
+		}
+
+		this.#idleTimer = setTimeout(() => {
+			this.#abort("idle-timeout");
+		}, this.#timeoutMs);
+	}
+
+	dispose(): void {
+		if (this.#idleTimer) {
+			clearTimeout(this.#idleTimer);
+			this.#idleTimer = undefined;
+		}
+		if (this.#hardTimeoutTimer) {
+			clearTimeout(this.#hardTimeoutTimer);
+			this.#hardTimeoutTimer = undefined;
+		}
+		if (this.#signal && this.#signalAbortHandler) {
+			this.#signal.removeEventListener("abort", this.#signalAbortHandler);
+			this.#signalAbortHandler = undefined;
+		}
+	}
+
+	#abort(reason: ExecutionAbortReason): void {
+		if (this.#abortReason) {
+			return;
+		}
+
+		this.#abortReason = reason;
+
+		if (this.#idleTimer) {
+			clearTimeout(this.#idleTimer);
+			this.#idleTimer = undefined;
+		}
+
+		if (!this.#abortController.signal.aborted) {
+			this.#abortController.abort(reason);
+		}
+
+		this.#onAbort?.(reason);
+		this.#armHardTimeout();
+	}
+
+	#armHardTimeout(): void {
+		if (this.#hardTimeoutTimer || this.#hardTimeoutGraceMs <= 0) {
+			return;
+		}
+
+		this.#hardTimeoutTimer = setTimeout(() => {
+			this.#hardTimeoutDeferred.resolve("hard-timeout");
+		}, this.#hardTimeoutGraceMs);
+	}
+}
+
+export function formatIdleTimeoutMessage(timeoutMs?: number): string {
+	if (timeoutMs === undefined) {
+		return "Command timed out without output";
+	}
+
+	const seconds = Math.max(1, Math.round(timeoutMs / 1000));
+	return `Command timed out after ${seconds} seconds without output`;
+}

package/src/exec/non-interactive-env.ts

@@ -13,6 +13,11 @@ export const NON_INTERACTIVE_ENV: Readonly<Record<string, string>> = {
 	AWS_PAGER: "",
 	HOMEBREW_PAGER: "cat",
 	LESS: "FRX",
+	// Disable terminal features that can block the process.
+	TERM: "dumb",
+	GPG_TTY: "not a tty",
+	NO_COLOR: "1",
+	PYTHONUNBUFFERED: "1",
 	// Disable editor and terminal credential prompts.
 	GIT_EDITOR: "true",
 	VISUAL: "true",

package/src/extensibility/custom-commands/bundled/ci-green/index.ts

@@ -1,4 +1,4 @@
-import { renderPromptTemplate } from "../../../../config/prompt-templates";
+import { prompt } from "@oh-my-pi/pi-utils";
 import type { CustomCommand, CustomCommandAPI } from "../../../../extensibility/custom-commands/types";
 import type { HookCommandContext } from "../../../../extensibility/hooks/types";
 import ciGreenRequestTemplate from "../../../../prompts/ci-green-request.md" with { type: "text" };
@@ -20,6 +20,6 @@ export class GreenCommand implements CustomCommand {
 
 	async execute(_args: string[], _ctx: HookCommandContext): Promise<string> {
 		const headTag = await getHeadTag(this.api);
-		return renderPromptTemplate(ciGreenRequestTemplate, { headTag });
+		return prompt.render(ciGreenRequestTemplate, { headTag });
 	}
 }

package/src/extensibility/custom-commands/bundled/review/index.ts

@@ -11,7 +11,7 @@
  * rich context for the orchestrating agent to distribute work across
  * multiple reviewer agents based on diff weight and locality.
  */
-import { renderPromptTemplate } from "../../../../config/prompt-templates";
+import { prompt } from "@oh-my-pi/pi-utils";
 import type { CustomCommand, CustomCommandAPI } from "../../../../extensibility/custom-commands/types";
 import type { HookCommandContext } from "../../../../extensibility/hooks/types";
 import reviewRequestTemplate from "../../../../prompts/review-request.md" with { type: "text" };
@@ -197,7 +197,7 @@ const MAX_FILES_FOR_INLINE_DIFF = 20; // Don't include diff if more files than t
 /**
  * Build the full review prompt with diff stats and distribution guidance.
  */
-function buildReviewPrompt(mode: string, stats: DiffStats, rawDiff: string): string {
+function buildReviewPrompt(mode: string, stats: DiffStats, rawDiff: string, additionalInstructions?: string): string {
 	const agentCount = getRecommendedAgentCount(stats);
 	const skipDiff = rawDiff.length > MAX_DIFF_CHARS || stats.files.length > MAX_FILES_FOR_INLINE_DIFF;
 	const totalLines = stats.totalAdded + stats.totalRemoved;
@@ -209,7 +209,7 @@ function buildReviewPrompt(mode: string, stats: DiffStats, rawDiff: string): str
 		hunksPreview: skipDiff ? getDiffPreview(f.hunks, linesPerFile) : "",
 	}));
 
-	return renderPromptTemplate(reviewRequestTemplate, {
+	return prompt.render(reviewRequestTemplate, {
 		mode,
 		files: filesWithExt,
 		excluded: stats.excluded,
@@ -221,6 +221,7 @@ function buildReviewPrompt(mode: string, stats: DiffStats, rawDiff: string): str
 		skipDiff,
 		rawDiff: rawDiff.trim(),
 		linesPerFile,
+		additionalInstructions,
 	});
 }
 
@@ -230,17 +231,30 @@ export class ReviewCommand implements CustomCommand {
 
 	constructor(private api: CustomCommandAPI) {}
 
-	async execute(_args: string[], ctx: HookCommandContext): Promise<string | undefined> {
+	async execute(args: string[], ctx: HookCommandContext): Promise<string | undefined> {
 		if (!ctx.hasUI) {
-			return "Use the Task tool to run the 'reviewer' agent to review recent code changes.";
+			const base = "Use the Task tool to run the 'reviewer' agent to review recent code changes.";
+			return args.length > 0 ? `${base} Focus: ${args.join(" ")}` : base;
 		}
 
-		const mode = await ctx.ui.select("Review Mode", [
-			"1. Review against a base branch (PR Style)",
-			"2. Review uncommitted changes",
-			"3. Review a specific commit",
-			"4. Custom review instructions",
-		]);
+		// Inline args act as additional instructions appended to the generated prompt.
+		// When present, skip option 4 (editor) — the args already provide the instructions.
+		const extraInstructions = args.length > 0 ? args.join(" ") : undefined;
+
+		const menuItems = extraInstructions
+			? [
+					"1. Review against a base branch (PR Style)",
+					"2. Review uncommitted changes",
+					"3. Review a specific commit",
+				]
+			: [
+					"1. Review against a base branch (PR Style)",
+					"2. Review uncommitted changes",
+					"3. Review a specific commit",
+					"4. Custom review instructions",
+				];
+
+		const mode = await ctx.ui.select("Review Mode", menuItems);
 
 		if (!mode) return undefined;
 
@@ -282,6 +296,7 @@ export class ReviewCommand implements CustomCommand {
 					`Reviewing changes between \`${baseBranch}\` and \`${currentBranch}\` (PR-style)`,
 					stats,
 					diffText,
+					extraInstructions,
 				);
 			}
 
@@ -318,7 +333,12 @@ export class ReviewCommand implements CustomCommand {
 					return undefined;
 				}
 
-				return buildReviewPrompt("Reviewing uncommitted changes (staged + unstaged)", stats, combinedDiff);
+				return buildReviewPrompt(
+					"Reviewing uncommitted changes (staged + unstaged)",
+					stats,
+					combinedDiff,
+					extraInstructions,
+				);
 			}
 
 			case 3: {
@@ -354,7 +374,7 @@ export class ReviewCommand implements CustomCommand {
 					return undefined;
 				}
 
-				return buildReviewPrompt(`Reviewing commit \`${hash}\``, stats, diffText);
+				return buildReviewPrompt(`Reviewing commit \`${hash}\``, stats, diffText, extraInstructions);
 			}
 
 			case 4: {
@@ -374,11 +394,12 @@ export class ReviewCommand implements CustomCommand {
 				if (reviewDiff) {
 					const stats = parseDiff(reviewDiff);
 					// Even if all files filtered, include the custom instructions
-					return `${buildReviewPrompt(
+					return buildReviewPrompt(
 						`Custom review: ${instructions.split("\n")[0].slice(0, 60)}…`,
 						stats,
 						reviewDiff,
-					)}\n\n### Additional Instructions\n\n${instructions}`;
+						instructions,
+					);
 				}
 
 				// No diff available, just pass instructions

package/src/extensibility/custom-commands/loader.ts

@@ -6,7 +6,6 @@
  */
 import * as fs from "node:fs";
 import * as path from "node:path";
-import * as piCodingAgent from "@oh-my-pi/pi-coding-agent";
 import { getAgentDir, getProjectDir, isEnoent, logger } from "@oh-my-pi/pi-utils";
 import * as typebox from "@sinclair/typebox";
 import { getConfigDirs } from "../../config";
@@ -184,7 +183,7 @@ export async function loadCustomCommands(options: LoadCustomCommandsOptions = {}
 		exec: (command: string, args: string[], execOptions) =>
 			execCommand(command, args, execOptions?.cwd ?? cwd, execOptions),
 		typebox,
-		pi: piCodingAgent,
+		pi: await import("@oh-my-pi/pi-coding-agent"),
 	};
 
 	// 1. Load bundled commands first (lowest priority - can be overridden)

package/src/extensibility/custom-tools/loader.ts

@@ -5,7 +5,7 @@
  * to avoid import resolution issues with custom tools loaded from user directories.
  */
 import * as path from "node:path";
-import * as piCodingAgent from "@oh-my-pi/pi-coding-agent";
+import type { AgentToolResult } from "@oh-my-pi/pi-agent-core";
 import { logger } from "@oh-my-pi/pi-utils";
 import * as typebox from "@sinclair/typebox";
 import { toolCapability } from "../../capability/tool";
@@ -14,7 +14,6 @@ import type { ExecOptions } from "../../exec/exec";
 import { execCommand } from "../../exec/exec";
 import type { HookUIContext } from "../../extensibility/hooks/types";
 import { getAllPluginToolPaths } from "../../extensibility/plugins/loader";
-import type { PendingActionStore } from "../../tools/pending-action";
 import { createNoOpUIContext, resolvePath } from "../utils";
 import type { CustomToolAPI, CustomToolFactory, LoadedCustomTool, ToolLoadError } from "./types";
 
@@ -85,7 +84,17 @@ export class CustomToolLoader {
 	#sharedApi: CustomToolAPI;
 	#seenNames: Set<string>;
 
-	constructor(cwd: string, builtInToolNames: string[], pendingActionStore?: PendingActionStore) {
+	constructor(
+		pi: typeof import("@oh-my-pi/pi-coding-agent"),
+		cwd: string,
+		builtInToolNames: string[],
+		pushPendingAction?: (action: {
+			label: string;
+			sourceToolName: string;
+			apply(reason: string): Promise<AgentToolResult<unknown>>;
+			reject?(reason: string): Promise<AgentToolResult<unknown> | undefined>;
+		}) => void,
+	) {
 		this.#sharedApi = {
 			cwd,
 			exec: (command: string, args: string[], options?: ExecOptions) =>
@@ -94,17 +103,16 @@ export class CustomToolLoader {
 			hasUI: false,
 			logger,
 			typebox,
-			pi: piCodingAgent,
+			pi,
 			pushPendingAction: action => {
-				if (!pendingActionStore) {
+				if (!pushPendingAction) {
 					throw new Error("Pending action store unavailable for custom tools in this runtime.");
 				}
-				pendingActionStore.push({
+				pushPendingAction({
 					label: action.label,
 					sourceToolName: action.sourceToolName ?? "custom_tool",
 					apply: action.apply,
 					reject: action.reject,
-					details: action.details,
 				});
 			},
 		};
@@ -155,9 +163,19 @@ export async function loadCustomTools(
 	pathsWithSources: ToolPathWithSource[],
 	cwd: string,
 	builtInToolNames: string[],
-	pendingActionStore?: PendingActionStore,
+	pushPendingAction?: (action: {
+		label: string;
+		sourceToolName: string;
+		apply(reason: string): Promise<AgentToolResult<unknown>>;
+		reject?(reason: string): Promise<AgentToolResult<unknown> | undefined>;
+	}) => void,
 ) {
-	const loader = new CustomToolLoader(cwd, builtInToolNames, pendingActionStore);
+	const loader = new CustomToolLoader(
+		await import("@oh-my-pi/pi-coding-agent"),
+		cwd,
+		builtInToolNames,
+		pushPendingAction,
+	);
 	await loader.load(pathsWithSources);
 	return {
 		tools: loader.tools,
@@ -182,7 +200,12 @@ export async function discoverAndLoadCustomTools(
 	configuredPaths: string[],
 	cwd: string,
 	builtInToolNames: string[],
-	pendingActionStore?: PendingActionStore,
+	pushPendingAction?: (action: {
+		label: string;
+		sourceToolName: string;
+		apply(reason: string): Promise<AgentToolResult<unknown>>;
+		reject?(reason: string): Promise<AgentToolResult<unknown> | undefined>;
+	}) => void,
 ) {
 	const allPathsWithSources: ToolPathWithSource[] = [];
 	const seen = new Set<string>();
@@ -216,5 +239,5 @@ export async function discoverAndLoadCustomTools(
 		addPath(resolvePath(configPath, cwd), { provider: "config", providerName: "Config", level: "project" });
 	}
 
-	return loadCustomTools(allPathsWithSources, cwd, builtInToolNames, pendingActionStore);
+	return loadCustomTools(allPathsWithSources, cwd, builtInToolNames, pushPendingAction);
 }

package/src/extensibility/extensions/loader.ts

@@ -6,7 +6,6 @@ import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent, Model, TextContent } from "@oh-my-pi/pi-ai";
-import * as piCodingAgent from "@oh-my-pi/pi-coding-agent";
 import type { KeyId } from "@oh-my-pi/pi-tui";
 import { hasFsCode, isEacces, isEnoent, logger } from "@oh-my-pi/pi-utils";
 import type { TSchema } from "@sinclair/typebox";
@@ -102,7 +101,6 @@ export class ExtensionRuntime implements IExtensionRuntime {
 class ConcreteExtensionAPI implements ExtensionAPI, IExtensionRuntime {
 	readonly logger = logger;
 	readonly typebox = TypeBox;
-	readonly pi = piCodingAgent;
 	readonly flagValues = new Map<string, boolean | string>();
 	readonly pendingProviderRegistrations: Array<{
 		name: string;
@@ -111,6 +109,7 @@ class ConcreteExtensionAPI implements ExtensionAPI, IExtensionRuntime {
 	}> = [];
 
 	constructor(
+		public readonly pi: typeof import("@oh-my-pi/pi-coding-agent"),
 		private readonly extension: Extension,
 		private readonly runtime: IExtensionRuntime,
 		private readonly cwd: string,
@@ -265,7 +264,13 @@ async function loadExtension(
 		}
 
 		const extension = createExtension(extensionPath, resolvedPath);
-		const api = new ConcreteExtensionAPI(extension, runtime, cwd, eventBus);
+		const api = new ConcreteExtensionAPI(
+			await import("@oh-my-pi/pi-coding-agent"),
+			extension,
+			runtime,
+			cwd,
+			eventBus,
+		);
 		await factory(api);
 
 		return { extension, error: null };
@@ -286,7 +291,7 @@ export async function loadExtensionFromFactory(
 	name = "<inline>",
 ): Promise<Extension> {
 	const extension = createExtension(name, name);
-	const api = new ConcreteExtensionAPI(extension, runtime, cwd, eventBus);
+	const api = new ConcreteExtensionAPI(await import("@oh-my-pi/pi-coding-agent"), extension, runtime, cwd, eventBus);
 	await factory(api);
 	return extension;
 }

package/src/extensibility/extensions/runner.ts

@@ -262,6 +262,10 @@ export class ExtensionRunner {
 		return allFlags;
 	}
 
+	getFlagValues(): Map<string, boolean | string> {
+		return new Map(this.runtime.flagValues);
+	}
+
 	setFlagValue(name: string, value: boolean | string): void {
 		this.runtime.flagValues.set(name, value);
 	}
@@ -695,7 +699,26 @@ export class ExtensionRunner {
 
 	async emitContext(messages: AgentMessage[]): Promise<AgentMessage[]> {
 		const ctx = this.createContext();
-		let currentMessages = structuredClone(messages);
+
+		// Check if any extensions actually have context handlers before cloning
+		let hasContextHandlers = false;
+		for (const ext of this.extensions) {
+			if (ext.handlers.get("context")?.length) {
+				hasContextHandlers = true;
+				break;
+			}
+		}
+		if (!hasContextHandlers) return messages;
+
+		let currentMessages: AgentMessage[];
+		try {
+			currentMessages = structuredClone(messages);
+		} catch {
+			// Messages may contain non-cloneable objects (e.g. in ToolResultMessage.details
+			// or ProviderPayload). Fall back to a shallow array clone — extensions should
+			// return new message arrays rather than mutating in place.
+			currentMessages = [...messages];
+		}
 
 		for (const ext of this.extensions) {
 			const handlers = ext.handlers.get("context");

package/src/extensibility/extensions/types.ts

@@ -28,11 +28,11 @@ import type { Static, TSchema } from "@sinclair/typebox";
 import type { Rule } from "../../capability/rule";
 import type { KeybindingsManager } from "../../config/keybindings";
 import type { ModelRegistry } from "../../config/model-registry";
+import type { EditToolDetails } from "../../edit";
 import type { BashResult } from "../../exec/bash-executor";
 import type { ExecOptions, ExecResult } from "../../exec/exec";
 import type { PythonResult } from "../../ipy/executor";
 import type { Theme } from "../../modes/theme/theme";
-import type { EditToolDetails } from "../../patch";
 import type { CompactionPreparation, CompactionResult } from "../../session/compaction";
 import type { CustomMessage } from "../../session/messages";
 import type {

package/src/extensibility/hooks/loader.ts

@@ -2,7 +2,6 @@
  * Hook loader - loads TypeScript hook modules using native Bun import.
  */
 import * as path from "node:path";
-import * as piCodingAgent from "@oh-my-pi/pi-coding-agent";
 import { logger } from "@oh-my-pi/pi-utils";
 import * as typebox from "@sinclair/typebox";
 import { hookCapability } from "../../capability/hook";
@@ -87,16 +86,16 @@ export interface LoadHooksResult {
  * Create a HookAPI instance that collects handlers, renderers, and commands.
  * Returns the API, maps, and functions to set handlers later.
  */
-function createHookAPI(
+async function createHookAPI(
 	handlers: Map<string, HandlerFn[]>,
 	cwd: string,
-): {
+): Promise<{
 	api: HookAPI;
 	messageRenderers: Map<string, HookMessageRenderer>;
 	commands: Map<string, RegisteredCommand>;
 	setSendMessageHandler: (handler: SendMessageHandler) => void;
 	setAppendEntryHandler: (handler: AppendEntryHandler) => void;
-} {
+}> {
 	let sendMessageHandler: SendMessageHandler | null = null;
 	let appendEntryHandler: AppendEntryHandler | null = null;
 	const messageRenderers = new Map<string, HookMessageRenderer>();
@@ -137,7 +136,7 @@ function createHookAPI(
 		},
 		logger,
 		typebox,
-		pi: piCodingAgent,
+		pi: await import("@oh-my-pi/pi-coding-agent"),
 	} as HookAPI;
 
 	return {
@@ -170,7 +169,7 @@ async function loadHook(hookPath: string, cwd: string): Promise<{ hook: LoadedHo
 
 		// Create handlers map and API
 		const handlers = new Map<string, HandlerFn[]>();
-		const { api, messageRenderers, commands, setSendMessageHandler, setAppendEntryHandler } = createHookAPI(
+		const { api, messageRenderers, commands, setSendMessageHandler, setAppendEntryHandler } = await createHookAPI(
 			handlers,
 			cwd,
 		);

package/src/extensibility/hooks/types.ts

@@ -9,9 +9,9 @@ import type { ImageContent, Message, Model, TextContent, ToolResultMessage } fro
 import type { Component, TUI } from "@oh-my-pi/pi-tui";
 import type { Rule } from "../../capability/rule";
 import type { ModelRegistry } from "../../config/model-registry";
+import type { EditToolDetails } from "../../edit";
 import type { ExecOptions, ExecResult } from "../../exec/exec";
 import type { Theme } from "../../modes/theme/theme";
-import type { EditToolDetails } from "../../patch";
 import type { CompactionPreparation, CompactionResult } from "../../session/compaction";
 import type { HookMessage } from "../../session/messages";
 import type {

package/src/extensibility/plugins/doctor.ts

@@ -1,3 +1,4 @@
+import { $which } from "@oh-my-pi/pi-utils";
 import { theme } from "../../modes/theme/theme";
 import type { DoctorCheck } from "./types";
 
@@ -12,7 +13,7 @@ export async function runDoctorChecks(): Promise<DoctorCheck[]> {
 	];
 
 	for (const tool of tools) {
-		const path = Bun.which(tool.name);
+		const path = $which(tool.name);
 		checks.push({
 			name: tool.name,
 			status: path ? "ok" : "warning",

package/src/extensibility/slash-commands.ts

@@ -1,10 +1,7 @@
 import type { AutocompleteItem } from "@oh-my-pi/pi-tui";
+import { parseFrontmatter, prompt } from "@oh-my-pi/pi-utils";
 import { slashCommandCapability } from "../capability/slash-command";
-import {
-	appendInlineArgsFallback,
-	renderPromptTemplate,
-	templateUsesInlineArgPlaceholders,
-} from "../config/prompt-templates";
+import { appendInlineArgsFallback, templateUsesInlineArgPlaceholders } from "../config/prompt-templates";
 import type { SlashCommand } from "../discovery";
 import { loadCapability } from "../discovery";
 import {
@@ -14,7 +11,6 @@ import {
 } from "../slash-commands/builtin-registry";
 import { EMBEDDED_COMMAND_TEMPLATES } from "../task/commands";
 import { parseCommandArgs, substituteArgs } from "../utils/command-args";
-import { parseFrontmatter } from "../utils/frontmatter";
 
 export type SlashCommandSource = "extension" | "prompt" | "skill";
 
@@ -223,7 +219,7 @@ export function expandSlashCommand(text: string, fileCommands: FileSlashCommand[
 		const argsText = args.join(" ");
 		const usesInlineArgPlaceholders = templateUsesInlineArgPlaceholders(fileCommand.content);
 		const substituted = substituteArgs(fileCommand.content, args);
-		const rendered = renderPromptTemplate(substituted, { args, ARGUMENTS: argsText, arguments: argsText });
+		const rendered = prompt.render(substituted, { args, ARGUMENTS: argsText, arguments: argsText });
 		return appendInlineArgsFallback(rendered, argsText, usesInlineArgPlaceholders);
 	}
 

package/src/index.ts

@@ -16,6 +16,7 @@ export type * from "./config/prompt-templates";
 export * from "./config/prompt-templates";
 export type { RetrySettings, SkillsSettings } from "./config/settings";
 export { Settings, settings } from "./config/settings";
+export * from "./edit/modes/hashline";
 // Custom commands
 export type * from "./extensibility/custom-commands/types";
 export type * from "./extensibility/custom-tools";
@@ -37,7 +38,6 @@ export * from "./modes";
 export * from "./modes/components";
 // Theme utilities for custom tools
 export * from "./modes/theme/theme";
-export * from "./patch/hashline";
 // SDK for programmatic usage
 export * from "./sdk";
 export * from "./session/agent-session";
@@ -46,6 +46,7 @@ export * from "./session/auth-storage";
 // Compaction
 export * from "./session/compaction";
 export * from "./session/messages";
+export * from "./session/session-dump-format";
 export * from "./session/session-manager";
 export * from "./task/executor";
 export type * from "./task/types";