@oh-my-pi/pi-coding-agent 15.13.3 → 16.0.0

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

@@ -2,22 +2,10 @@
  * 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, ToolExample, TSchema } from "@oh-my-pi/pi-ai";
-import { getInbandGrammar, renderToolInventory } from "@oh-my-pi/pi-ai/grammar";
-import { preferredToolSyntax } from "@oh-my-pi/pi-catalog/identity";
-import { canonicalizeMessage } from "../utils/thinking-display";
-import {
-	type BashExecutionMessage,
-	type BranchSummaryMessage,
-	bashExecutionToText,
-	type CompactionSummaryMessage,
-	type CustomMessage,
-	type FileMentionMessage,
-	type HookMessage,
-	type PythonExecutionMessage,
-	pythonExecutionToText,
-} from "./messages";
+import type { Model, ToolExample, TSchema } from "@oh-my-pi/pi-ai";
+import { getDialectDefinition, renderToolInventory } from "@oh-my-pi/pi-ai/dialect";
+import { preferredDialect } from "@oh-my-pi/pi-catalog/identity";
+import { convertToLlm } from "./messages";
 
 /** Minimal tool shape for dump output (matches AgentTool fields used by formatSessionDumpText). */
 export interface SessionDumpToolInfo {
@@ -40,7 +28,7 @@ export interface FormatSessionDumpTextOptions {
  */
 export function formatSessionDumpText(options: FormatSessionDumpTextOptions): string {
 	const lines: string[] = [];
-	const grammar = getInbandGrammar(preferredToolSyntax(options.model?.id ?? ""));
+	const definition = getDialectDefinition(preferredDialect(options.model?.id ?? ""));
 
 	const systemPrompt = options.systemPrompt?.filter(prompt => prompt.length > 0) ?? [];
 	if (systemPrompt.length > 0) {
@@ -62,125 +50,21 @@ export function formatSessionDumpText(options: FormatSessionDumpTextOptions): st
 	lines.push("\n");
 
 	const tools = options.tools ?? [];
-	if (tools.length > 0) {
+	const inventoryTools = tools.map(tool => ({
+		name: tool.name,
+		description: tool.description,
+		parameters: tool.parameters as TSchema,
+		examples: tool.examples,
+	}));
+	if (inventoryTools.length > 0) {
 		lines.push("## Available Tools\n");
-		const inventoryTools = tools.map(tool => ({
-			name: tool.name,
-			description: tool.description,
-			parameters: tool.parameters as TSchema,
-			examples: tool.examples,
-		}));
 		lines.push(renderToolInventory(inventoryTools, options.model?.id ?? ""));
 		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") {
-					const thinking = canonicalizeMessage(c.thinking);
-					if (thinking.length === 0) continue;
-					lines.push("<thinking>");
-					lines.push(thinking);
-					lines.push("</thinking>\n");
-				} else if (c.type === "toolCall") {
-					const args = { ...(c.arguments as Record<string, unknown>) };
-					delete args[INTENT_FIELD];
-					lines.push(grammar.renderToolCall({ ...c, arguments: args }));
-				}
-			}
-			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");
-		}
-	}
+	lines.push("## Transcript\n");
+	lines.push(definition.renderTranscript(convertToLlm([...options.messages]), { tools: inventoryTools }));
+	lines.push("\n");
 
 	return lines.join("\n").trim();
 }

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

@@ -22,6 +22,10 @@ import type {
 export interface HistoryFormatOptions {
 	/** Optional H1 prepended to the transcript. */
 	title?: string;
+	/** Render assistant thinking blocks (default: elided). */
+	includeThinking?: boolean;
+	/** Render tool intent comment before tool call lines. */
+	includeToolIntent?: boolean;
 }
 
 /** Max length of the primary-arg summary inside `→ tool(...)` lines. */
@@ -100,17 +104,30 @@ function toolCallLine(
 	name: string,
 	args: Record<string, unknown> | undefined,
 	result: ToolResultMessage | undefined,
+	includeToolIntent?: boolean,
 ): string {
 	const head = `→ ${name}(${primaryArg(args)})`;
-	if (!result) return `${head} ⇒ pending`;
-	const text = contentToText(result.content);
-	const lines = lineCount(text);
-	const count = `${lines} ${lines === 1 ? "line" : "lines"}`;
-	if (result.isError) {
-		const firstLine = oneLine(text.split("\n", 1)[0] ?? "");
-		return firstLine ? `${head} ⇒ error · ${count} — ${firstLine}` : `${head} ⇒ error · ${count}`;
+	let base: string;
+	if (!result) {
+		base = `${head} ⇒ pending`;
+	} else {
+		const text = contentToText(result.content);
+		const lines = lineCount(text);
+		const count = `${lines} ${lines === 1 ? "line" : "lines"}`;
+		if (result.isError) {
+			const firstLine = oneLine(text.split("\n", 1)[0] ?? "");
+			base = firstLine ? `${head} ⇒ error · ${count} — ${firstLine}` : `${head} ⇒ error · ${count}`;
+		} else {
+			base = `${head} ⇒ ok · ${count}`;
+		}
+	}
+
+	const intent = includeToolIntent ? args?.[INTENT_FIELD] : undefined;
+	if (typeof intent === "string" && intent.trim()) {
+		const formattedIntent = oneLine(intent, 80);
+		return `# ${formattedIntent}\n${base}`;
 	}
-	return `${head} ⇒ ok · ${count}`;
+	return base;
 }
 
 /** One line for a user-initiated `!`/`$` execution. */
@@ -193,9 +210,11 @@ export function formatSessionHistoryMarkdown(messages: unknown[], opts?: History
 					} else if (block.type === "toolCall") {
 						const result = resultsByCallId.get(block.id);
 						if (result) consumed.add(block.id);
-						body.push(toolCallLine(block.name, block.arguments, result));
+						body.push(toolCallLine(block.name, block.arguments, result, opts?.includeToolIntent));
+					} else if (opts?.includeThinking && block.type === "thinking" && block.thinking.trim()) {
+						body.push(`_thinking:_ ${block.thinking}`);
 					}
-					// thinking / redactedThinking elided entirely
+					// redactedThinking elided entirely (no readable text)
 				}
 				if (body.length === 0) break;
 				lines.push("## assistant", "", ...body, "");
@@ -204,7 +223,7 @@ export function formatSessionHistoryMarkdown(messages: unknown[], opts?: History
 			case "toolResult": {
 				// Normally consumed by its toolCall; orphans (e.g. truncated history) get their own line.
 				if (consumed.has(msg.toolCallId)) break;
-				lines.push(toolCallLine(msg.toolName, undefined, msg), "");
+				lines.push(toolCallLine(msg.toolName, undefined, msg, opts?.includeToolIntent), "");
 				break;
 			}
 			case "bashExecution": {

package/src/session/yield-queue.ts

@@ -6,6 +6,8 @@ export interface YieldDispatcher<P> {
 	isStale?(entry: P): boolean;
 	/** Produce one batched AgentMessage from non-stale entries. Return null to skip. */
 	build(survivors: P[]): AgentMessage | null;
+	/** If true, entries for this kind are drained only by {@link drainLazy} and never trigger the idle flush. */
+	skipIdleFlush?: boolean;
 }
 
 export interface YieldQueueOptions {
@@ -20,6 +22,7 @@ type YieldFlushMode = "streaming" | "idle";
 interface StoredDispatcher {
 	isStale?: (entry: unknown) => boolean;
 	build: (survivors: unknown[]) => AgentMessage | null;
+	skipIdleFlush?: boolean;
 }
 
 function formatError(error: unknown): string {
@@ -40,6 +43,7 @@ export class YieldQueue {
 		const stored: StoredDispatcher = {
 			...(dispatcher.isStale ? { isStale: entry => dispatcher.isStale?.(entry as P) ?? false } : {}),
 			build: survivors => dispatcher.build(survivors as P[]),
+			...(dispatcher.skipIdleFlush ? { skipIdleFlush: true } : {}),
 		};
 		this.#dispatchers.set(kind, stored);
 		return () => {
@@ -60,7 +64,7 @@ export class YieldQueue {
 			this.#entries.set(kind, entries);
 		}
 		entries.push(entry);
-		if (!this.#options.isStreaming()) {
+		if (!this.#options.isStreaming() && !this.#dispatchers.get(kind)!.skipIdleFlush) {
 			this.#scheduleIdleFlush();
 		}
 	}

package/src/slash-commands/builtin-registry.ts

@@ -419,6 +419,100 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<SlashCommandSpec> = [
 			runtime.ctx.editor.setText("");
 		},
 	},
+	{
+		name: "advisor",
+		description: "Toggle the advisor (a second model that reviews each turn and injects notes)",
+		acpDescription: "Toggle advisor",
+		acpInputHint: "[on|off|status|dump [raw]]",
+		subcommands: [
+			{ name: "on", description: "Enable the advisor" },
+			{ name: "off", description: "Disable the advisor" },
+			{ name: "status", description: "Show advisor status" },
+			{ name: "dump", description: "Copy the advisor's transcript to clipboard", usage: "[raw]" },
+		],
+		allowArgs: true,
+		handle: async (command, runtime) => {
+			const { verb, rest } = parseSubcommand(command.args);
+			if (!verb || verb === "toggle") {
+				const active = runtime.session.toggleAdvisorEnabled();
+				const configured = runtime.session.settings.get("advisor.enabled") as boolean;
+				if (active) {
+					await runtime.output("Advisor enabled.");
+				} else if (configured) {
+					await runtime.output("Advisor setting enabled, but no model is assigned to the 'advisor' role.");
+				} else {
+					await runtime.output("Advisor disabled.");
+				}
+				return commandConsumed();
+			}
+			if (verb === "on") {
+				const active = runtime.session.setAdvisorEnabled(true);
+				await runtime.output(
+					active ? "Advisor enabled." : "Advisor setting enabled, but no model is assigned to the 'advisor' role.",
+				);
+				return commandConsumed();
+			}
+			if (verb === "off") {
+				runtime.session.setAdvisorEnabled(false);
+				await runtime.output("Advisor disabled.");
+				return commandConsumed();
+			}
+			if (verb === "status") {
+				await runtime.output(runtime.session.formatAdvisorStatus());
+				return commandConsumed();
+			}
+			if (verb === "dump") {
+				const isRaw = rest.toLowerCase() === "raw";
+				const text = runtime.session.formatAdvisorHistoryAsText({ compact: !isRaw });
+				await runtime.output(text ?? "Advisor is not active for this session.");
+				return commandConsumed();
+			}
+			return usage("Usage: /advisor [on|off|status|dump [raw]]", runtime);
+		},
+		handleTui: async (command, runtime) => {
+			const { verb, rest } = parseSubcommand(command.args);
+			if (!verb || verb === "toggle") {
+				const active = runtime.ctx.session.toggleAdvisorEnabled();
+				const configured = runtime.ctx.session.settings.get("advisor.enabled") as boolean;
+				if (active) {
+					runtime.ctx.showStatus("Advisor enabled.");
+				} else if (configured) {
+					runtime.ctx.showStatus("Advisor setting enabled, but no model is assigned to the 'advisor' role.");
+				} else {
+					runtime.ctx.showStatus("Advisor disabled.");
+				}
+				runtime.ctx.editor.setText("");
+				return;
+			}
+			if (verb === "on") {
+				const active = runtime.ctx.session.setAdvisorEnabled(true);
+				runtime.ctx.showStatus(
+					active ? "Advisor enabled." : "Advisor setting enabled, but no model is assigned to the 'advisor' role.",
+				);
+				runtime.ctx.editor.setText("");
+				return;
+			}
+			if (verb === "off") {
+				runtime.ctx.session.setAdvisorEnabled(false);
+				runtime.ctx.showStatus("Advisor disabled.");
+				runtime.ctx.editor.setText("");
+				return;
+			}
+			if (verb === "status") {
+				await runtime.ctx.handleAdvisorStatusCommand();
+				runtime.ctx.editor.setText("");
+				return;
+			}
+			if (verb === "dump") {
+				const isRaw = rest.toLowerCase() === "raw";
+				runtime.ctx.handleAdvisorDumpCommand(isRaw);
+				runtime.ctx.editor.setText("");
+				return;
+			}
+			runtime.ctx.showStatus("Usage: /advisor [on|off|status|dump [raw]]");
+			runtime.ctx.editor.setText("");
+		},
+	},
 	{
 		name: "export",
 		description: "Export session to HTML file",
@@ -450,13 +544,17 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<SlashCommandSpec> = [
 		name: "dump",
 		description: "Copy session transcript to clipboard",
 		acpDescription: "Return full transcript as plain text",
-		handle: async (_command, runtime) => {
-			const text = runtime.session.formatSessionAsText();
+		inlineHint: "[raw]",
+		allowArgs: true,
+		handle: async (command, runtime) => {
+			const isRaw = command.args.trim().toLowerCase() === "raw";
+			const text = runtime.session.formatSessionAsText({ compact: !isRaw });
 			await runtime.output(text || "No messages to dump yet.");
 			return commandConsumed();
 		},
-		handleTui: async (_command, runtime) => {
-			await runtime.ctx.handleDumpCommand();
+		handleTui: (command, runtime) => {
+			const isRaw = command.args.trim().toLowerCase() === "raw";
+			runtime.ctx.handleDumpCommand(isRaw);
 			runtime.ctx.editor.setText("");
 		},
 	},

package/src/system-prompt.ts

@@ -5,7 +5,7 @@
 import * as os from "node:os";
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
 import type { ToolExample, TSchema } from "@oh-my-pi/pi-ai";
-import { renderToolInventory } from "@oh-my-pi/pi-ai/grammar";
+import { renderToolInventory } from "@oh-my-pi/pi-ai/dialect";
 import { $env, getGpuCachePath, getProjectDir, hasFsCode, isEnoent, logger, prompt } from "@oh-my-pi/pi-utils";
 import { $ } from "bun";
 import { contextFileCapability } from "./capability/context-file";

package/src/tools/path-utils.ts

@@ -143,6 +143,37 @@ export function expandPath(filePath: string): string {
 	const normalized = stripFileUrl(normalizeUnicodeSpaces(normalizeAtPrefix(filePath)));
 	return expandTilde(normalized);
 }
+
+function isAsciiDriveLetter(value: string): boolean {
+	if (value.length !== 1) return false;
+	const code = value.charCodeAt(0);
+	return (code >= 65 && code <= 90) || (code >= 97 && code <= 122);
+}
+
+function windowsDriveAliasPath(filePath: string): string | undefined {
+	if (!filePath.startsWith("/")) return undefined;
+	const parts = filePath.split("/");
+	if (parts[0] !== "") return undefined;
+
+	let drive: string | undefined;
+	let tailStart = 2;
+	if (parts.length >= 2 && isAsciiDriveLetter(parts[1] ?? "")) {
+		drive = parts[1]!.toUpperCase();
+	} else if (parts.length >= 3 && (parts[1] ?? "").toLowerCase() === "mnt" && isAsciiDriveLetter(parts[2] ?? "")) {
+		drive = parts[2]!.toUpperCase();
+		tailStart = 3;
+	}
+	if (!drive) return undefined;
+
+	const tail = parts.slice(tailStart).filter(Boolean).join("\\");
+	return tail ? `${drive}:\\${tail}` : `${drive}:\\`;
+}
+
+export function normalizeWindowsDriveAliasPath(filePath: string, platform: NodeJS.Platform = process.platform): string {
+	if (platform !== "win32") return filePath;
+	return windowsDriveAliasPath(filePath) ?? filePath;
+}
+
 /**
  * Inclusive line range describing one selector segment (e.g. `50-100`,
  * `301-`, or `50+10`). `endLine` is `undefined` for open-ended ranges.
@@ -353,7 +384,7 @@ export function isInternalUrlPath(filePath: string): boolean {
  */
 export function resolveToCwd(filePath: string, cwd: string): string {
 	const normalized = normalizeLocalScheme(filePath);
-	const expanded = expandPath(normalized);
+	const expanded = normalizeWindowsDriveAliasPath(expandPath(normalized));
 	const expandedAndNormalized = normalizeLocalScheme(expanded);
 
 	assertNotInternalUrl(expandedAndNormalized, normalized);
@@ -530,8 +561,8 @@ export async function splitDelimitedPathEntry(
 	}
 
 	return (
-		(await tryDelimitedPathSplit(normalizedEntry, cwd, splitter, "comma", false)) ??
 		(await tryDelimitedPathSplit(normalizedEntry, cwd, splitter, "semicolon", false)) ??
+		(await tryDelimitedPathSplit(normalizedEntry, cwd, splitter, "comma", false)) ??
 		(await tryDelimitedPathSplit(normalizedEntry, cwd, splitter, "whitespace", true)) ??
 		(await tryDelimitedPathSplit(normalizedEntry, cwd, splitter, "mixed", true))
 	);

package/src/tools/report-tool-issue.ts

@@ -20,10 +20,9 @@
  * never blocked on the network and never throws.
  */
 import { Database } from "bun:sqlite";
-import path from "node:path";
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
 import type { FetchImpl } from "@oh-my-pi/pi-ai";
-import { $env, $flag, getAgentDir, getInstallId, logger, VERSION } from "@oh-my-pi/pi-utils";
+import { $env, $flag, getAutoQaDbDir, getInstallId, logger, VERSION } from "@oh-my-pi/pi-utils";
 import { z } from "zod/v4";
 import type { Settings } from "..";
 import type { ToolSession } from "./index";
@@ -184,10 +183,6 @@ export async function resolveAutoQaConsent(settings: Settings | undefined): Prom
 	return consentInFlight;
 }
 
-export function getAutoQaDbPath(): string {
-	return path.join(getAgentDir(), "autoqa.db");
-}
-
 let cachedDb: Database | null = null;
 
 /**
@@ -205,7 +200,7 @@ let cachedDb: Database | null = null;
 export function openAutoQaDb(): Database | null {
 	if (cachedDb) return cachedDb;
 	try {
-		const db = new Database(getAutoQaDbPath());
+		const db = new Database(getAutoQaDbDir());
 		// Install the busy handler BEFORE any lock-taking statement. See #2421.
 		db.run("PRAGMA busy_timeout = 5000");
 		db.run(`

package/src/web/scrapers/docs-rs.ts

@@ -1,7 +1,7 @@
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import { gunzipSync } from "node:zlib";
-import { getAgentDir, isEnoent, logger, ptree, tryParseJson } from "@oh-my-pi/pi-utils";
+import { getDocsRsCacheDir, isEnoent, logger, ptree, tryParseJson } from "@oh-my-pi/pi-utils";
 import { ToolAbortError } from "../../tools/tool-errors";
 import type { RenderResult, SpecialHandler } from "./types";
 import { buildResult, MAX_BYTES } from "./types";
@@ -276,7 +276,6 @@ function findItemInModule(mod_: RustdocItem, name: string, index: Record<string,
 	return null;
 }
 
-const DOCS_RS_CACHE_ROOT = "webcache";
 const DOCS_RS_CACHE_FILENAME = "rustdoc.json";
 
 function sanitizeCacheSegment(value: string): string {
@@ -291,7 +290,7 @@ function getDocsRsCacheVersionSegment(version: string, now = new Date()): string
 function getDocsRsCachePath(target: DocsRsTarget, now = new Date()): string {
 	const crate = sanitizeCacheSegment(target.crateName);
 	const version = getDocsRsCacheVersionSegment(target.version, now);
-	return path.join(getAgentDir(), DOCS_RS_CACHE_ROOT, `docsrs_${crate}_${version}`, DOCS_RS_CACHE_FILENAME);
+	return path.join(getDocsRsCacheDir(), `docsrs_${crate}_${version}`, DOCS_RS_CACHE_FILENAME);
 }
 
 async function readCachedRustdocCrate(