@oh-my-pi/pi-coding-agent 6.9.69 → 8.0.0

package/src/{core → session}/agent-session.ts

@@ -15,26 +15,34 @@
 
 import { existsSync, readFileSync } from "node:fs";
 import type { Agent, AgentEvent, AgentMessage, AgentState, AgentTool, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
-import type { AssistantMessage, ImageContent, Message, Model, TextContent, ToolCall, Usage } from "@oh-my-pi/pi-ai";
+import type {
+	AssistantMessage,
+	ImageContent,
+	Message,
+	Model,
+	TextContent,
+	ToolCall,
+	Usage,
+	UsageReport,
+} from "@oh-my-pi/pi-ai";
 import { isContextOverflow, modelsAreEqual, supportsXhigh } from "@oh-my-pi/pi-ai";
 import { abortableSleep, logger } from "@oh-my-pi/pi-utils";
-import type { Rule } from "../capability/rule";
-import { getAgentDbPath } from "../config";
-import { theme } from "../modes/interactive/theme/theme";
-import ttsrInterruptTemplate from "../prompts/system/ttsr-interrupt.md" with { type: "text" };
-import { type BashResult, executeBash as executeBashCommand } from "./bash-executor";
+import { YAML } from "bun";
+import type { Rule } from "$c/capability/rule";
+import { getAgentDbPath } from "$c/config";
+import type { ModelRegistry } from "$c/config/model-registry";
+import { parseModelString } from "$c/config/model-resolver";
 import {
-	type CompactionResult,
-	calculateContextTokens,
-	collectEntriesForBranchSummary,
-	compact,
-	estimateTokens,
-	generateBranchSummary,
-	prepareCompaction,
-	shouldCompact,
-} from "./compaction/index";
-import type { LoadedCustomCommand } from "./custom-commands/index";
-import { exportSessionToHtml } from "./export-html/index";
+	expandPromptTemplate,
+	type PromptTemplate,
+	parseCommandArgs,
+	renderPromptTemplate,
+} from "$c/config/prompt-templates";
+import type { SettingsManager, SkillsSettings } from "$c/config/settings-manager";
+import { type BashResult, executeBash as executeBashCommand } from "$c/exec/bash-executor";
+import { exportSessionToHtml } from "$c/export/html/index";
+import type { TtsrManager } from "$c/export/ttsr";
+import type { LoadedCustomCommand } from "$c/extensibility/custom-commands/index";
 import type {
 	ExtensionCommandContext,
 	ExtensionRunner,
@@ -46,25 +54,43 @@ import type {
 	TreePreparation,
 	TurnEndEvent,
 	TurnStartEvent,
-} from "./extensions";
-import type { CompactOptions, ContextUsage } from "./extensions/types";
-import { extractFileMentions, generateFileMentionMessages } from "./file-mentions";
-import type { HookCommandContext } from "./hooks/types";
-import type { BashExecutionMessage, CustomMessage, PythonExecutionMessage } from "./messages";
-import type { ModelRegistry } from "./model-registry";
-import { parseModelString } from "./model-resolver";
-import { expandPromptTemplate, type PromptTemplate, parseCommandArgs, renderPromptTemplate } from "./prompt-templates";
-import { executePython as executePythonCommand, type PythonResult } from "./python-executor";
+} from "$c/extensibility/extensions";
+import type { CompactOptions, ContextUsage } from "$c/extensibility/extensions/types";
+import type { HookCommandContext } from "$c/extensibility/hooks/types";
+import type { Skill, SkillWarning } from "$c/extensibility/skills";
+import { expandSlashCommand, type FileSlashCommand } from "$c/extensibility/slash-commands";
+import { executePython as executePythonCommand, type PythonResult } from "$c/ipy/executor";
+import { theme } from "$c/modes/theme/theme";
+import { normalizeDiff, normalizeToLF, ParseError, previewPatch, stripBom } from "$c/patch";
+import ttsrInterruptTemplate from "$c/prompts/system/ttsr-interrupt.md" with { type: "text" };
+import { closeAllConnections } from "$c/ssh/connection-manager";
+import { unmountAll } from "$c/ssh/sshfs-mount";
+import { outputMeta } from "$c/tools/output-meta";
+import { resolveToCwd } from "$c/tools/path-utils";
+import type { TodoItem } from "$c/tools/todo-write";
+import { extractFileMentions, generateFileMentionMessages } from "$c/utils/file-mentions";
+import {
+	type CompactionResult,
+	calculateContextTokens,
+	collectEntriesForBranchSummary,
+	compact,
+	estimateTokens,
+	generateBranchSummary,
+	prepareCompaction,
+	shouldCompact,
+} from "./compaction/index";
+import {
+	type BashExecutionMessage,
+	type BranchSummaryMessage,
+	bashExecutionToText,
+	type CompactionSummaryMessage,
+	type CustomMessage,
+	type FileMentionMessage,
+	type HookMessage,
+	type PythonExecutionMessage,
+	pythonExecutionToText,
+} from "./messages";
 import type { BranchSummaryEntry, CompactionEntry, NewSessionOptions, SessionManager } from "./session-manager";
-import type { SettingsManager, SkillsSettings } from "./settings-manager";
-import type { Skill, SkillWarning } from "./skills";
-import { expandSlashCommand, type FileSlashCommand } from "./slash-commands";
-import { closeAllConnections } from "./ssh/connection-manager";
-import { unmountAll } from "./ssh/sshfs-mount";
-import { normalizeDiff, normalizeToLF, ParseError, previewPatch, stripBom } from "./tools/patch";
-import { resolveToCwd } from "./tools/path-utils";
-import type { TodoItem } from "./tools/todo-write";
-import type { TtsrManager } from "./ttsr";
 
 /** Session-specific events that extend the core AgentEvent */
 export type AgentSessionEvent =
@@ -567,7 +593,7 @@ export class AgentSession {
 
 		const args = toolCall.arguments;
 		if (!args || typeof args !== "object" || Array.isArray(args)) return;
-		if ("oldText" in args || "newText" in args) return;
+		if ("old_text" in args || "new_text" in args) return;
 
 		const path = typeof args.path === "string" ? args.path : undefined;
 		if (!path) return;
@@ -612,7 +638,7 @@ export class AgentSession {
 
 		const args = toolCall.arguments;
 		if (!args || typeof args !== "object" || Array.isArray(args)) return;
-		if ("oldText" in args || "newText" in args) return;
+		if ("old_text" in args || "new_text" in args) return;
 
 		const path = typeof args.path === "string" ? args.path : undefined;
 		const diff = typeof args.diff === "string" ? args.diff : undefined;
@@ -2577,6 +2603,7 @@ export class AgentSession {
 	 * Used by executeBash and by extensions that handle bash execution themselves.
 	 */
 	recordBashResult(command: string, result: BashResult, options?: { excludeFromContext?: boolean }): void {
+		const meta = outputMeta().truncationFromSummary(result, { direction: "tail" }).get();
 		const bashMessage: BashExecutionMessage = {
 			role: "bashExecution",
 			command,
@@ -2584,7 +2611,7 @@ export class AgentSession {
 			exitCode: result.exitCode,
 			cancelled: result.cancelled,
 			truncated: result.truncated,
-			fullOutputPath: result.fullOutputPath,
+			meta,
 			timestamp: Date.now(),
 			excludeFromContext: options?.excludeFromContext,
 		};
@@ -2681,6 +2708,7 @@ export class AgentSession {
 	 * Record a Python execution result in session history.
 	 */
 	recordPythonResult(code: string, result: PythonResult, options?: { excludeFromContext?: boolean }): void {
+		const meta = outputMeta().truncationFromSummary(result, { direction: "tail" }).get();
 		const pythonMessage: PythonExecutionMessage = {
 			role: "pythonExecution",
 			code,
@@ -2688,7 +2716,7 @@ export class AgentSession {
 			exitCode: result.exitCode,
 			cancelled: result.cancelled,
 			truncated: result.truncated,
-			fullOutputPath: result.fullOutputPath,
+			meta,
 			timestamp: Date.now(),
 			excludeFromContext: options?.excludeFromContext,
 		};
@@ -3161,6 +3189,14 @@ export class AgentSession {
 		};
 	}
 
+	async fetchUsageReports(): Promise<UsageReport[] | null> {
+		const authStorage = this._modelRegistry.authStorage;
+		if (!authStorage.fetchUsageReports) return null;
+		return authStorage.fetchUsageReports({
+			baseUrlResolver: (provider) => this._modelRegistry.getProviderBaseUrl?.(provider),
+		});
+	}
+
 	/**
 	 * Estimate context tokens from messages, using the last assistant usage when available.
 	 */
@@ -3265,6 +3301,36 @@ export class AgentSession {
 	formatSessionAsText(): string {
 		const lines: string[] = [];
 
+		// Include system prompt at the beginning
+		const systemPrompt = this.agent.state.systemPrompt;
+		if (systemPrompt) {
+			lines.push("## System Prompt\n");
+			lines.push(systemPrompt);
+			lines.push("\n");
+		}
+
+		// Include model and thinking level
+		const model = this.agent.state.model;
+		const thinkingLevel = this.agent.state.thinkingLevel;
+		lines.push("## Configuration\n");
+		lines.push(`Model: ${model.provider}/${model.id}`);
+		lines.push(`Thinking Level: ${thinkingLevel}`);
+		lines.push("\n");
+
+		// Include available tools
+		const tools = this.agent.state.tools;
+		if (tools.length > 0) {
+			lines.push("## Available Tools\n");
+			for (const tool of tools) {
+				lines.push(`### ${tool.name}\n`);
+				lines.push(tool.description);
+				lines.push("\n```yaml");
+				lines.push(YAML.stringify(tool.parameters, null, 2));
+				lines.push("```\n");
+			}
+			lines.push("\n");
+		}
+
 		for (const msg of this.messages) {
 			if (msg.role === "user") {
 				lines.push("## User\n");
@@ -3293,8 +3359,8 @@ export class AgentSession {
 						lines.push("</thinking>\n");
 					} else if (c.type === "toolCall") {
 						lines.push(`### Tool: ${c.name}`);
-						lines.push("```json");
-						lines.push(JSON.stringify(c.arguments, null, 2));
+						lines.push("```yaml");
+						lines.push(YAML.stringify(c.arguments, null, 2));
 						lines.push("```\n");
 					}
 				}
@@ -3314,6 +3380,56 @@ export class AgentSession {
 					}
 				}
 				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}">`);
+					lines.push(file.content);
+					lines.push("</file>\n");
+				}
+				lines.push("\n");
 			}
 		}
 

package/src/{core → session}/agent-storage.ts

@@ -2,9 +2,9 @@ import { Database } from "bun:sqlite";
 import { chmodSync, existsSync, mkdirSync } from "node:fs";
 import { dirname } from "node:path";
 import { logger } from "@oh-my-pi/pi-utils";
-import { getAgentDbPath } from "../config";
+import { getAgentDbPath } from "$c/config";
+import type { Settings } from "$c/config/settings-manager";
 import type { AuthCredential } from "./auth-storage";
-import type { Settings } from "./settings-manager";
 
 /** Prepared SQLite statement type from bun:sqlite */
 type Statement = ReturnType<Database["prepare"]>;

package/src/session/artifacts.ts

@@ -0,0 +1,110 @@
+/**
+ * Session-scoped artifact storage for truncated tool outputs.
+ *
+ * Artifacts are stored in a directory alongside the session file,
+ * accessible via artifact:// URLs or the $ARTIFACTS environment variable.
+ */
+
+import { mkdir, readdir } from "node:fs/promises";
+import { join } from "node:path";
+
+/**
+ * Manages artifact storage for a session.
+ *
+ * Artifacts are stored with sequential IDs in the session's artifact directory.
+ * The directory is created lazily on first write.
+ */
+export class ArtifactManager {
+	#nextId = 0;
+	readonly #dir: string;
+	#dirCreated = false;
+
+	/**
+	 * @param sessionFile Path to the session .jsonl file
+	 */
+	constructor(sessionFile: string) {
+		// Artifact directory is session file path without .jsonl extension
+		this.#dir = sessionFile.slice(0, -6);
+	}
+
+	/**
+	 * Artifact directory path.
+	 * Directory may not exist until first artifact is saved.
+	 */
+	get dir(): string {
+		return this.#dir;
+	}
+
+	async #ensureDir(): Promise<void> {
+		if (!this.#dirCreated) {
+			await mkdir(this.#dir, { recursive: true });
+			this.#dirCreated = true;
+		}
+	}
+
+	/**
+	 * Atomically allocate next artifact ID.
+	 * IDs are sequential within the session.
+	 */
+	allocateId(): number {
+		return this.#nextId++;
+	}
+
+	/**
+	 * Allocate a new artifact path and ID without writing content.
+	 *
+	 * @param toolType Tool name for file extension (e.g., "bash", "fetch")
+	 */
+	async allocatePath(toolType: string): Promise<{ id: string; path: string }> {
+		await this.#ensureDir();
+		const id = String(this.allocateId());
+		const filename = `${id}.${toolType}.txt`;
+		return { id, path: join(this.#dir, filename) };
+	}
+
+	/**
+	 * Save content as an artifact and return the artifact ID.
+	 *
+	 * @param content Full content to save
+	 * @param toolType Tool name for file extension (e.g., "bash", "fetch")
+	 * @returns Artifact ID (numeric string)
+	 */
+	async save(content: string, toolType: string): Promise<string> {
+		const { id, path } = await this.allocatePath(toolType);
+		await Bun.write(path, content);
+		return id;
+	}
+
+	/**
+	 * Check if an artifact exists.
+	 * @param id Artifact ID (numeric string)
+	 */
+	async exists(id: string): Promise<boolean> {
+		const files = await this.listFiles();
+		return files.some((f) => f.startsWith(`${id}.`));
+	}
+
+	/**
+	 * List all artifact files in the directory.
+	 * Returns empty array if directory doesn't exist.
+	 */
+	async listFiles(): Promise<string[]> {
+		try {
+			return await readdir(this.#dir);
+		} catch {
+			return [];
+		}
+	}
+
+	/**
+	 * Get the full path to an artifact file.
+	 * Returns null if artifact doesn't exist.
+	 *
+	 * @param id Artifact ID (numeric string)
+	 */
+	async getPath(id: string): Promise<string | null> {
+		const files = await this.listFiles();
+		const match = files.find((f) => f.startsWith(`${id}.`));
+		return match ? join(this.#dir, match) : null;
+	}
+}