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

package/src/session/agent-storage.ts

@@ -73,7 +73,7 @@ export class AgentStorage {
 	 * AuthCredentialStore handles auth_credentials and cache tables.
 	 */
 	#initializeSchema(): void {
-		this.#db.exec(`
+		this.#db.run(`
 PRAGMA journal_mode=WAL;
 PRAGMA synchronous=NORMAL;
 PRAGMA busy_timeout=5000;
@@ -92,7 +92,7 @@ CREATE TABLE IF NOT EXISTS schema_version (version INTEGER PRIMARY KEY);
 		const hasValue = settingsInfo.some(column => column.name === "value");
 
 		if (!hasSettingsTable) {
-			this.#db.exec(`
+			this.#db.run(`
 CREATE TABLE settings (
 	key TEXT PRIMARY KEY,
 	value TEXT NOT NULL,
@@ -117,8 +117,8 @@ CREATE TABLE settings (
 			}
 
 			const migrate = this.#db.transaction((settings: Record<string, unknown> | null) => {
-				this.#db.exec("DROP TABLE settings");
-				this.#db.exec(`
+				this.#db.run("DROP TABLE settings");
+				this.#db.run(`
 CREATE TABLE settings (
 	key TEXT PRIMARY KEY,
 	value TEXT NOT NULL,
@@ -169,34 +169,34 @@ CREATE TABLE settings (
 
 	#migrateSchemaV4ToV5(): void {
 		const migrate = this.#db.transaction(() => {
-			this.#db.exec("ALTER TABLE settings RENAME TO settings_legacy");
-			this.#db.exec(`
+			this.#db.run("ALTER TABLE settings RENAME TO settings_legacy");
+			this.#db.run(`
 CREATE TABLE settings (
 	key TEXT PRIMARY KEY,
 	value TEXT NOT NULL,
 	updated_at INTEGER NOT NULL DEFAULT (${SQLITE_NOW_EPOCH})
 );
 `);
-			this.#db.exec(`
+			this.#db.run(`
 INSERT INTO settings (key, value, updated_at)
 SELECT key, value, updated_at
 FROM settings_legacy
 `);
-			this.#db.exec("DROP TABLE settings_legacy");
+			this.#db.run("DROP TABLE settings_legacy");
 
-			this.#db.exec("ALTER TABLE model_usage RENAME TO model_usage_legacy");
-			this.#db.exec(`
+			this.#db.run("ALTER TABLE model_usage RENAME TO model_usage_legacy");
+			this.#db.run(`
 CREATE TABLE model_usage (
 	model_key TEXT PRIMARY KEY,
 	last_used_at INTEGER NOT NULL DEFAULT (${SQLITE_NOW_EPOCH})
 );
 `);
-			this.#db.exec(`
+			this.#db.run(`
 INSERT INTO model_usage (model_key, last_used_at)
 SELECT model_key, last_used_at
 FROM model_usage_legacy
 `);
-			this.#db.exec("DROP TABLE model_usage_legacy");
+			this.#db.run("DROP TABLE model_usage_legacy");
 		});
 		migrate();
 	}

package/src/session/compaction/branch-summarization.ts

@@ -7,7 +7,7 @@
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { Model } from "@oh-my-pi/pi-ai";
 import { completeSimple } from "@oh-my-pi/pi-ai";
-import { renderPromptTemplate } from "../../config/prompt-templates";
+import { prompt } from "@oh-my-pi/pi-utils";
 import branchSummaryPrompt from "../../prompts/compaction/branch-summary.md" with { type: "text" };
 import branchSummaryPreamble from "../../prompts/compaction/branch-summary-preamble.md" with { type: "text" };
 import {
@@ -244,9 +244,9 @@ export function prepareBranchEntries(entries: SessionEntry[], tokenBudget: numbe
 // Summary Generation
 // ============================================================================
 
-const BRANCH_SUMMARY_PREAMBLE = renderPromptTemplate(branchSummaryPreamble);
+const BRANCH_SUMMARY_PREAMBLE = prompt.render(branchSummaryPreamble);
 
-const BRANCH_SUMMARY_PROMPT = renderPromptTemplate(branchSummaryPrompt);
+const BRANCH_SUMMARY_PROMPT = prompt.render(branchSummaryPrompt);
 
 /**
  * Generate a summary of abandoned branch entries.

package/src/session/compaction/compaction.ts

@@ -26,8 +26,7 @@ import {
 	getOpenAIResponsesHistoryPayload,
 	normalizeResponsesToolCallId,
 } from "@oh-my-pi/pi-ai/utils";
-import { logger } from "@oh-my-pi/pi-utils";
-import { renderPromptTemplate } from "../../config/prompt-templates";
+import { logger, prompt } from "@oh-my-pi/pi-utils";
 import compactionShortSummaryPrompt from "../../prompts/compaction/compaction-short-summary.md" with { type: "text" };
 import compactionSummaryPrompt from "../../prompts/compaction/compaction-summary.md" with { type: "text" };
 import compactionTurnPrefixPrompt from "../../prompts/compaction/compaction-turn-prefix.md" with { type: "text" };
@@ -474,11 +473,11 @@ export function findCutPoint(
 // Summarization
 // ============================================================================
 
-const SUMMARIZATION_PROMPT = renderPromptTemplate(compactionSummaryPrompt);
+const SUMMARIZATION_PROMPT = prompt.render(compactionSummaryPrompt);
 
-const UPDATE_SUMMARIZATION_PROMPT = renderPromptTemplate(compactionUpdateSummaryPrompt);
+const UPDATE_SUMMARIZATION_PROMPT = prompt.render(compactionUpdateSummaryPrompt);
 
-const SHORT_SUMMARY_PROMPT = renderPromptTemplate(compactionShortSummaryPrompt);
+const SHORT_SUMMARY_PROMPT = prompt.render(compactionShortSummaryPrompt);
 
 function formatAdditionalContext(context: string[] | undefined): string {
 	if (!context || context.length === 0) return "";
@@ -1201,7 +1200,7 @@ export function prepareCompaction(
 // Main compaction function
 // ============================================================================
 
-const TURN_PREFIX_SUMMARIZATION_PROMPT = renderPromptTemplate(compactionTurnPrefixPrompt);
+const TURN_PREFIX_SUMMARIZATION_PROMPT = prompt.render(compactionTurnPrefixPrompt);
 
 /**
  * Generate summaries for compaction using prepared data.

package/src/session/compaction/utils.ts

@@ -3,7 +3,7 @@
  */
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { Message } from "@oh-my-pi/pi-ai";
-import { renderPromptTemplate } from "../../config/prompt-templates";
+import { prompt } from "@oh-my-pi/pi-utils";
 import fileOperationsTemplate from "../../prompts/system/file-operations.md" with { type: "text" };
 import summarizationSystemPrompt from "../../prompts/system/summarization-system.md" with { type: "text" };
 
@@ -86,7 +86,7 @@ function stripFileOperationTags(summary: string): string {
 }
 export function formatFileOperations(readFiles: string[], modifiedFiles: string[]): string {
 	if (readFiles.length === 0 && modifiedFiles.length === 0) return "";
-	return renderPromptTemplate(fileOperationsTemplate, {
+	return prompt.render(fileOperationsTemplate, {
 		readFiles: truncateFileList(readFiles),
 		modifiedFiles: truncateFileList(modifiedFiles),
 	});
@@ -181,4 +181,4 @@ export function serializeConversation(messages: Message[]): string {
 // Summarization System Prompt
 // ============================================================================
 
-export const SUMMARIZATION_SYSTEM_PROMPT = renderPromptTemplate(summarizationSystemPrompt);
+export const SUMMARIZATION_SYSTEM_PROMPT = prompt.render(summarizationSystemPrompt);

package/src/session/history-storage.ts

@@ -19,12 +19,47 @@ type HistoryRow = {
 
 const SQLITE_NOW_EPOCH = "CAST(strftime('%s','now') AS INTEGER)";
 
+class AsyncDrain<T> {
+	#queue?: T[];
+	#promise = Promise.resolve();
+
+	constructor(readonly delayMs: number = 0) {}
+
+	push(value: T, hnd: (values: T[]) => Promise<void> | void): Promise<void> {
+		let queue = this.#queue;
+		if (!queue) {
+			this.#queue = queue = [];
+			this.#promise = new Promise((resolve, reject) => {
+				const exec = () => {
+					try {
+						if (this.#queue === queue) {
+							this.#queue = undefined;
+						}
+						resolve(hnd(queue!));
+					} catch (error) {
+						reject(error);
+					}
+				};
+
+				if (this.delayMs > 0) {
+					setTimeout(exec, this.delayMs);
+				} else {
+					queueMicrotask(exec);
+				}
+			});
+		}
+		queue.push(value);
+		return this.#promise;
+	}
+}
+
 export class HistoryStorage {
 	#db: Database;
 	static #instance?: HistoryStorage;
+	#drain = new AsyncDrain<Pick<HistoryEntry, "prompt" | "cwd">>(100);
 
 	// Prepared statements
-	#insertStmt: Statement;
+	#insertRowStmt: Statement;
 	#recentStmt: Statement;
 	#searchStmt: Statement;
 	#lastPromptStmt: Statement;
@@ -39,7 +74,7 @@ export class HistoryStorage {
 
 		const hasFts = this.#db.prepare("SELECT 1 FROM sqlite_master WHERE type='table' AND name='history_fts'").get();
 
-		this.#db.exec(`
+		this.#db.run(`
 PRAGMA journal_mode=WAL;
 PRAGMA synchronous=NORMAL;
 PRAGMA busy_timeout=5000;
@@ -71,7 +106,6 @@ CREATE TRIGGER IF NOT EXISTS history_ai AFTER INSERT ON history BEGIN
 			}
 		}
 
-		this.#insertStmt = this.#db.prepare("INSERT INTO history (prompt, cwd) VALUES (?, ?)");
 		this.#recentStmt = this.#db.prepare(
 			"SELECT id, prompt, created_at, cwd FROM history ORDER BY created_at DESC, id DESC LIMIT ?",
 		);
@@ -80,6 +114,8 @@ CREATE TRIGGER IF NOT EXISTS history_ai AFTER INSERT ON history BEGIN
 		);
 		this.#lastPromptStmt = this.#db.prepare("SELECT prompt FROM history ORDER BY id DESC LIMIT 1");
 
+		this.#insertRowStmt = this.#db.prepare("INSERT INTO history (prompt, cwd) VALUES (?, ?)");
+
 		const last = this.#lastPromptStmt.get() as { prompt?: string } | undefined;
 		this.#lastPromptCache = last?.prompt ?? null;
 	}
@@ -91,19 +127,26 @@ CREATE TRIGGER IF NOT EXISTS history_ai AFTER INSERT ON history BEGIN
 		return HistoryStorage.#instance;
 	}
 
-	add(prompt: string, cwd?: string): void {
-		const trimmed = prompt.trim();
-		if (!trimmed) return;
-		if (this.#lastPromptCache === trimmed) return;
-
-		this.#lastPromptCache = trimmed;
+	/** @internal Reset the singleton — test-only. */
+	static resetInstance(): void {
+		HistoryStorage.#instance = undefined;
+	}
 
-		setImmediate(() => {
-			try {
-				this.#insertStmt.run(trimmed, cwd ?? null);
-			} catch (error) {
-				logger.error("HistoryStorage add failed", { error: String(error) });
+	#insertBatch(rows: Array<Pick<HistoryEntry, "prompt" | "cwd">>): void {
+		this.#db.transaction((rows: Array<Pick<HistoryEntry, "prompt" | "cwd">>) => {
+			for (const row of rows) {
+				this.#insertRowStmt.run(row.prompt, row.cwd ?? null);
 			}
+		})(rows);
+	}
+
+	add(prompt: string, cwd?: string): Promise<void> {
+		const trimmed = prompt.trim();
+		if (!trimmed) return Promise.resolve();
+		if (this.#lastPromptCache === trimmed) return Promise.resolve();
+		this.#lastPromptCache = trimmed;
+		return this.#drain.push({ prompt: trimmed, cwd: cwd ?? undefined }, rows => {
+			this.#insertBatch(rows);
 		});
 	}
 
@@ -150,11 +193,11 @@ CREATE TRIGGER IF NOT EXISTS history_ai AFTER INSERT ON history BEGIN
 
 	#migrateHistorySchema(): void {
 		const migrate = this.#db.transaction(() => {
-			this.#db.exec("ALTER TABLE history RENAME TO history_legacy");
-			this.#db.exec("DROP INDEX IF EXISTS idx_history_created_at");
-			this.#db.exec("DROP TRIGGER IF EXISTS history_ai");
-			this.#db.exec("DROP TABLE IF EXISTS history_fts");
-			this.#db.exec(`
+			this.#db.run("ALTER TABLE history RENAME TO history_legacy");
+			this.#db.run("DROP INDEX IF EXISTS idx_history_created_at");
+			this.#db.run("DROP TRIGGER IF EXISTS history_ai");
+			this.#db.run("DROP TABLE IF EXISTS history_fts");
+			this.#db.run(`
 CREATE TABLE history (
 	id INTEGER PRIMARY KEY AUTOINCREMENT,
 	prompt TEXT NOT NULL,

package/src/session/messages.ts

@@ -14,7 +14,7 @@ import type {
 	TextContent,
 	ToolResultMessage,
 } from "@oh-my-pi/pi-ai";
-import { renderPromptTemplate } from "../config/prompt-templates";
+import { prompt } from "@oh-my-pi/pi-utils";
 import branchSummaryContextPrompt from "../prompts/compaction/branch-summary-context.md" with { type: "text" };
 import compactionSummaryContextPrompt from "../prompts/compaction/compaction-summary-context.md" with { type: "text" };
 import type { OutputMeta } from "../tools/output-meta";
@@ -310,7 +310,7 @@ export function convertToLlm(messages: AgentMessage[]): Message[] {
 						content: [
 							{
 								type: "text" as const,
-								text: renderPromptTemplate(BRANCH_SUMMARY_TEMPLATE, { summary: m.summary }),
+								text: prompt.render(BRANCH_SUMMARY_TEMPLATE, { summary: m.summary }),
 							},
 						],
 						attribution: "agent",
@@ -322,7 +322,7 @@ export function convertToLlm(messages: AgentMessage[]): Message[] {
 						content: [
 							{
 								type: "text" as const,
-								text: renderPromptTemplate(COMPACTION_SUMMARY_TEMPLATE, { summary: m.summary }),
+								text: prompt.render(COMPACTION_SUMMARY_TEMPLATE, { summary: m.summary }),
 							},
 						],
 						attribution: "agent",

package/src/session/session-dump-format.ts

@@ -0,0 +1,203 @@
+/**
+ * Plain-text / markdown session formatting (same shape as /dump clipboard export).
+ */
+import type { AgentMessage, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
+import { INTENT_FIELD } from "@oh-my-pi/pi-agent-core";
+import type { AssistantMessage, Model } from "@oh-my-pi/pi-ai";
+import {
+	type BashExecutionMessage,
+	type BranchSummaryMessage,
+	bashExecutionToText,
+	type CompactionSummaryMessage,
+	type CustomMessage,
+	type FileMentionMessage,
+	type HookMessage,
+	type PythonExecutionMessage,
+	pythonExecutionToText,
+} from "./messages";
+
+/** Minimal tool shape for dump output (matches AgentTool fields used by formatSessionDumpText). */
+export interface SessionDumpToolInfo {
+	name: string;
+	description: string;
+	parameters: unknown;
+}
+
+export interface FormatSessionDumpTextOptions {
+	messages: readonly AgentMessage[];
+	systemPrompt?: string | null;
+	model?: Model | null;
+	thinkingLevel?: ThinkingLevel | string | null;
+	tools?: readonly SessionDumpToolInfo[];
+}
+
+function stripTypeBoxFields(obj: unknown): unknown {
+	if (Array.isArray(obj)) {
+		return obj.map(stripTypeBoxFields);
+	}
+	if (obj && typeof obj === "object") {
+		const result: Record<string, unknown> = {};
+		for (const [k, v] of Object.entries(obj)) {
+			if (!k.startsWith("TypeBox.")) {
+				result[k] = stripTypeBoxFields(v);
+			}
+		}
+		return result;
+	}
+	return obj;
+}
+
+/** Serialize an object as XML parameter elements, one per key. */
+function formatArgsAsXml(args: Record<string, unknown>, indent = "\t"): string {
+	const parts: string[] = [];
+	for (const [key, value] of Object.entries(args)) {
+		if (key === INTENT_FIELD) continue;
+		const text = typeof value === "string" ? value : JSON.stringify(value);
+		parts.push(`${indent}<parameter name="${key}">${text}</parameter>`);
+	}
+	return parts.join("\n");
+}
+
+/**
+ * Format messages and session metadata as markdown/plain text (same as AgentSession.formatSessionAsText / /dump).
+ */
+export function formatSessionDumpText(options: FormatSessionDumpTextOptions): string {
+	const lines: string[] = [];
+
+	const systemPrompt = options.systemPrompt;
+	if (systemPrompt) {
+		lines.push("## System Prompt\n");
+		lines.push(systemPrompt);
+		lines.push("\n");
+	}
+
+	const model = options.model;
+	const thinkingLevel = options.thinkingLevel;
+	lines.push("## Configuration\n");
+	lines.push(`Model: ${model ? `${model.provider}/${model.id}` : "(not selected)"}`);
+	lines.push(`Thinking Level: ${thinkingLevel ?? ""}`);
+	lines.push("\n");
+
+	const tools = options.tools ?? [];
+	if (tools.length > 0) {
+		lines.push("## Available Tools\n");
+		for (const tool of tools) {
+			lines.push(`<tool name="${tool.name}">`);
+			lines.push(tool.description);
+			const parametersClean = stripTypeBoxFields(tool.parameters);
+			lines.push(`\nParameters:\n${formatArgsAsXml(parametersClean as Record<string, unknown>)}`);
+			lines.push("<" + "/tool>\n");
+		}
+		lines.push("\n");
+	}
+
+	for (const msg of options.messages) {
+		if (msg.role === "user" || msg.role === "developer") {
+			lines.push(msg.role === "developer" ? "## Developer\n" : "## User\n");
+			if (typeof msg.content === "string") {
+				lines.push(msg.content);
+			} else {
+				for (const c of msg.content) {
+					if (c.type === "text") {
+						lines.push(c.text);
+					} else if (c.type === "image") {
+						lines.push("[Image]");
+					}
+				}
+			}
+			lines.push("\n");
+		} else if (msg.role === "assistant") {
+			const assistantMsg = msg as AssistantMessage;
+			lines.push("## Assistant\n");
+
+			for (const c of assistantMsg.content) {
+				if (c.type === "text") {
+					lines.push(c.text);
+				} else if (c.type === "thinking") {
+					lines.push("<thinking>");
+					lines.push(c.thinking);
+					lines.push("</thinking>\n");
+				} else if (c.type === "toolCall") {
+					lines.push(`<invoke name="${c.name}">`);
+					if (c.arguments && typeof c.arguments === "object") {
+						lines.push(formatArgsAsXml(c.arguments as Record<string, unknown>));
+					}
+					lines.push("<" + "/invoke>\n");
+				}
+			}
+			lines.push("");
+		} else if (msg.role === "toolResult") {
+			lines.push(`### Tool Result: ${msg.toolName}`);
+			if (msg.isError) {
+				lines.push("(error)");
+			}
+			for (const c of msg.content) {
+				if (c.type === "text") {
+					lines.push("```");
+					lines.push(c.text);
+					lines.push("```");
+				} else if (c.type === "image") {
+					lines.push("[Image output]");
+				}
+			}
+			lines.push("");
+		} else if (msg.role === "bashExecution") {
+			const bashMsg = msg as BashExecutionMessage;
+			if (!bashMsg.excludeFromContext) {
+				lines.push("## Bash Execution\n");
+				lines.push(bashExecutionToText(bashMsg));
+				lines.push("\n");
+			}
+		} else if (msg.role === "pythonExecution") {
+			const pythonMsg = msg as PythonExecutionMessage;
+			if (!pythonMsg.excludeFromContext) {
+				lines.push("## Python Execution\n");
+				lines.push(pythonExecutionToText(pythonMsg));
+				lines.push("\n");
+			}
+		} else if (msg.role === "custom" || msg.role === "hookMessage") {
+			const customMsg = msg as CustomMessage | HookMessage;
+			lines.push(`## ${customMsg.customType}\n`);
+			if (typeof customMsg.content === "string") {
+				lines.push(customMsg.content);
+			} else {
+				for (const c of customMsg.content) {
+					if (c.type === "text") {
+						lines.push(c.text);
+					} else if (c.type === "image") {
+						lines.push("[Image]");
+					}
+				}
+			}
+			lines.push("\n");
+		} else if (msg.role === "branchSummary") {
+			const branchMsg = msg as BranchSummaryMessage;
+			lines.push("## Branch Summary\n");
+			lines.push(`(from branch: ${branchMsg.fromId})\n`);
+			lines.push(branchMsg.summary);
+			lines.push("\n");
+		} else if (msg.role === "compactionSummary") {
+			const compactMsg = msg as CompactionSummaryMessage;
+			lines.push("## Compaction Summary\n");
+			lines.push(`(${compactMsg.tokensBefore} tokens before compaction)\n`);
+			lines.push(compactMsg.summary);
+			lines.push("\n");
+		} else if (msg.role === "fileMention") {
+			const fileMsg = msg as FileMentionMessage;
+			lines.push("## File Mention\n");
+			for (const file of fileMsg.files) {
+				lines.push(`<file path="${file.path}">`);
+				if (file.content) {
+					lines.push(file.content);
+				}
+				if (file.image) {
+					lines.push("[Image attached]");
+				}
+				lines.push("</file>\n");
+			}
+			lines.push("\n");
+		}
+	}
+
+	return lines.join("\n").trim();
+}

package/src/session/session-storage.ts

@@ -1,7 +1,9 @@
 import * as fs from "node:fs";
 import * as fsp from "node:fs/promises";
 import * as path from "node:path";
-import { isEnoent, toError } from "@oh-my-pi/pi-utils";
+import { isEnoent, peekFile, toError } from "@oh-my-pi/pi-utils";
+
+const utf8Decoder = new TextDecoder("utf-8");
 
 export interface SessionStorageStat {
 	size: number;
@@ -163,7 +165,7 @@ export class FileSessionStorage implements SessionStorage {
 	}
 
 	async readTextPrefix(path: string, maxBytes: number): Promise<string> {
-		return Bun.file(path).slice(0, maxBytes).text();
+		return peekFile(path, maxBytes, header => utf8Decoder.decode(header));
 	}
 
 	async writeText(path: string, content: string): Promise<void> {

package/src/session/streaming-output.ts

@@ -747,6 +747,6 @@ export function formatHeadTruncationNotice(
 	const totalFileLines = options.totalFileLines ?? truncation.totalLines;
 	const endLineDisplay = startLineDisplay + (truncation.outputLines ?? truncation.totalLines) - 1;
 	const nextOffset = endLineDisplay + 1;
-	const notice = `[Showing lines ${startLineDisplay}-${endLineDisplay} of ${totalFileLines}. Use offset=${nextOffset} to continue]`;
+	const notice = `[Showing lines ${startLineDisplay}-${endLineDisplay} of ${totalFileLines}. Use sel=L${nextOffset} to continue]`;
 	return `\n\n${notice}`;
 }