@oh-my-pi/pi-coding-agent 6.9.0 → 7.0.0

package/src/cli/stats-cli.ts

@@ -0,0 +1,191 @@
+/**
+ * Stats CLI command handlers.
+ *
+ * Handles `omp stats` subcommand for viewing AI usage statistics.
+ */
+
+import chalk from "chalk";
+import { APP_NAME } from "../config";
+
+// =============================================================================
+// Types
+// =============================================================================
+
+export interface StatsCommandArgs {
+	port: number;
+	json: boolean;
+	summary: boolean;
+}
+
+// =============================================================================
+// Argument Parser
+// =============================================================================
+
+/**
+ * Parse stats subcommand arguments.
+ * Returns undefined if not a stats command.
+ */
+export function parseStatsArgs(args: string[]): StatsCommandArgs | undefined {
+	if (args.length === 0 || args[0] !== "stats") {
+		return undefined;
+	}
+
+	const result: StatsCommandArgs = {
+		port: 3847,
+		json: false,
+		summary: false,
+	};
+
+	for (let i = 1; i < args.length; i++) {
+		const arg = args[i];
+		if (arg === "--json" || arg === "-j") {
+			result.json = true;
+		} else if (arg === "--summary" || arg === "-s") {
+			result.summary = true;
+		} else if ((arg === "--port" || arg === "-p") && i + 1 < args.length) {
+			result.port = parseInt(args[++i], 10);
+		} else if (arg.startsWith("--port=")) {
+			result.port = parseInt(arg.split("=")[1], 10);
+		}
+	}
+
+	return result;
+}
+
+// =============================================================================
+// Formatting Helpers
+// =============================================================================
+
+function formatNumber(n: number): string {
+	if (n >= 1_000_000) return `${(n / 1_000_000).toFixed(1)}M`;
+	if (n >= 1_000) return `${(n / 1_000).toFixed(1)}K`;
+	return n.toFixed(0);
+}
+
+function formatCost(n: number): string {
+	if (n < 0.01) return `$${n.toFixed(4)}`;
+	if (n < 1) return `$${n.toFixed(3)}`;
+	return `$${n.toFixed(2)}`;
+}
+
+function formatDuration(ms: number | null): string {
+	if (ms === null) return "-";
+	if (ms < 1000) return `${ms.toFixed(0)}ms`;
+	return `${(ms / 1000).toFixed(1)}s`;
+}
+
+function formatPercent(n: number): string {
+	return `${(n * 100).toFixed(1)}%`;
+}
+
+// =============================================================================
+// Command Handler
+// =============================================================================
+
+export async function runStatsCommand(cmd: StatsCommandArgs): Promise<void> {
+	// Lazy import to avoid loading stats module when not needed
+	const { getDashboardStats, syncAllSessions, getTotalMessageCount } = await import("@oh-my-pi/omp-stats");
+	const { startServer } = await import("@oh-my-pi/omp-stats/src/server");
+	const { closeDb } = await import("@oh-my-pi/omp-stats/src/db");
+
+	// Sync session files first
+	console.log("Syncing session files...");
+	const { processed, files } = await syncAllSessions();
+	const total = await getTotalMessageCount();
+	console.log(`Synced ${processed} new entries from ${files} files (${total} total)\n`);
+
+	if (cmd.json) {
+		const stats = await getDashboardStats();
+		console.log(JSON.stringify(stats, null, 2));
+		return;
+	}
+
+	if (cmd.summary) {
+		await printStatsSummary();
+		return;
+	}
+
+	// Start the dashboard server
+	const { port } = startServer(cmd.port);
+	console.log(chalk.green(`Dashboard available at: http://localhost:${port}`));
+	console.log("Press Ctrl+C to stop\n");
+
+	// Keep process running
+	process.on("SIGINT", () => {
+		console.log("\nShutting down...");
+		closeDb();
+		process.exit(0);
+	});
+
+	// Keep the process alive
+	await new Promise(() => {});
+}
+
+async function printStatsSummary(): Promise<void> {
+	const { getDashboardStats } = await import("@oh-my-pi/omp-stats");
+	const stats = await getDashboardStats();
+	const { overall, byModel, byFolder } = stats;
+
+	console.log(chalk.bold("\n=== AI Usage Statistics ===\n"));
+
+	console.log(chalk.bold("Overall:"));
+	console.log(`  Requests: ${formatNumber(overall.totalRequests)} (${formatNumber(overall.failedRequests)} errors)`);
+	console.log(`  Error Rate: ${formatPercent(overall.errorRate)}`);
+	console.log(`  Total Tokens: ${formatNumber(overall.totalInputTokens + overall.totalOutputTokens)}`);
+	console.log(`  Cache Rate: ${formatPercent(overall.cacheRate)}`);
+	console.log(`  Total Cost: ${formatCost(overall.totalCost)}`);
+	console.log(`  Avg Duration: ${formatDuration(overall.avgDuration)}`);
+	console.log(`  Avg TTFT: ${formatDuration(overall.avgTtft)}`);
+	if (overall.avgTokensPerSecond !== null) {
+		console.log(`  Avg Tokens/s: ${overall.avgTokensPerSecond.toFixed(1)}`);
+	}
+
+	if (byModel.length > 0) {
+		console.log(chalk.bold("\nBy Model:"));
+		for (const m of byModel.slice(0, 10)) {
+			console.log(
+				`  ${m.model}: ${formatNumber(m.totalRequests)} reqs, ${formatCost(m.totalCost)}, ${formatPercent(m.cacheRate)} cache`,
+			);
+		}
+	}
+
+	if (byFolder.length > 0) {
+		console.log(chalk.bold("\nBy Folder:"));
+		for (const f of byFolder.slice(0, 10)) {
+			console.log(`  ${f.folder}: ${formatNumber(f.totalRequests)} reqs, ${formatCost(f.totalCost)}`);
+		}
+	}
+
+	console.log("");
+}
+
+// =============================================================================
+// Help
+// =============================================================================
+
+export function printStatsHelp(): void {
+	console.log(`${chalk.bold(`${APP_NAME} stats`)} - AI Usage Statistics Dashboard
+
+${chalk.bold("Usage:")}
+  ${APP_NAME} stats [options]
+
+${chalk.bold("Options:")}
+  -p, --port <port>  Port for the dashboard server (default: 3847)
+  -j, --json         Output stats as JSON and exit
+  -s, --summary      Print summary to console and exit
+  -h, --help         Show this help message
+
+${chalk.bold("Examples:")}
+  ${APP_NAME} stats              # Start dashboard server
+  ${APP_NAME} stats --json       # Print stats as JSON
+  ${APP_NAME} stats --summary    # Print summary to console
+  ${APP_NAME} stats --port 8080  # Start on custom port
+
+${chalk.bold("Metrics:")}
+  - Total requests and error rate
+  - Token usage (input, output, cache)
+  - Cost breakdown
+  - Average duration and time to first token (TTFT)
+  - Tokens per second throughput
+`);
+}

package/src/core/agent-session.ts

@@ -15,9 +15,19 @@
 
 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 { YAML } from "bun";
 import type { Rule } from "../capability/rule";
 import { getAgentDbPath } from "../config";
 import { theme } from "../modes/interactive/theme/theme";
@@ -50,10 +60,21 @@ import type {
 import type { CompactOptions, ContextUsage } from "./extensions/types";
 import { extractFileMentions, generateFileMentionMessages } from "./file-mentions";
 import type { HookCommandContext } from "./hooks/types";
-import type { BashExecutionMessage, CustomMessage } from "./messages";
+import {
+	type BashExecutionMessage,
+	type BranchSummaryMessage,
+	bashExecutionToText,
+	type CompactionSummaryMessage,
+	type CustomMessage,
+	type FileMentionMessage,
+	type HookMessage,
+	type PythonExecutionMessage,
+	pythonExecutionToText,
+} 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";
 import type { BranchSummaryEntry, CompactionEntry, NewSessionOptions, SessionManager } from "./session-manager";
 import type { SettingsManager, SkillsSettings } from "./settings-manager";
 import type { Skill, SkillWarning } from "./skills";
@@ -248,6 +269,10 @@ export class AgentSession {
 	private _bashAbortController: AbortController | undefined = undefined;
 	private _pendingBashMessages: BashExecutionMessage[] = [];
 
+	// Python execution state
+	private _pythonAbortController: AbortController | undefined = undefined;
+	private _pendingPythonMessages: PythonExecutionMessage[] = [];
+
 	// Extension system
 	private _extensionRunner: ExtensionRunner | undefined = undefined;
 	private _turnIndex = 0;
@@ -1005,6 +1030,7 @@ export class AgentSession {
 
 		// Flush any pending bash messages before the new prompt
 		this._flushPendingBashMessages();
+		this._flushPendingPythonMessages();
 
 		// Reset todo reminder count on new user prompt
 		this._todoReminderCount = 0;
@@ -2631,6 +2657,102 @@ export class AgentSession {
 		this._pendingBashMessages = [];
 	}
 
+	// =========================================================================
+	// User-Initiated Python Execution
+	// =========================================================================
+
+	/**
+	 * Execute Python code in the shared kernel.
+	 * Uses the same kernel session as the agent's Python tool, allowing collaborative editing.
+	 * @param code The Python code to execute
+	 * @param onChunk Optional streaming callback for output
+	 * @param options.excludeFromContext If true, execution won't be sent to LLM ($$ prefix)
+	 */
+	async executePython(
+		code: string,
+		onChunk?: (chunk: string) => void,
+		options?: { excludeFromContext?: boolean },
+	): Promise<PythonResult> {
+		this._pythonAbortController = new AbortController();
+
+		try {
+			// Use the same session ID as the Python tool for kernel sharing
+			const sessionFile = this.sessionManager.getSessionFile();
+			const cwd = this.sessionManager.getCwd();
+			const sessionId = sessionFile ? `session:${sessionFile}:cwd:${cwd}` : `cwd:${cwd}`;
+
+			const result = await executePythonCommand(code, {
+				cwd,
+				sessionId,
+				kernelMode: this.settingsManager?.getPythonKernelMode?.() ?? "session",
+				useSharedGateway: this.settingsManager?.getPythonSharedGateway?.() ?? true,
+				onChunk,
+				signal: this._pythonAbortController.signal,
+			});
+
+			this.recordPythonResult(code, result, options);
+			return result;
+		} finally {
+			this._pythonAbortController = undefined;
+		}
+	}
+
+	/**
+	 * Record a Python execution result in session history.
+	 */
+	recordPythonResult(code: string, result: PythonResult, options?: { excludeFromContext?: boolean }): void {
+		const pythonMessage: PythonExecutionMessage = {
+			role: "pythonExecution",
+			code,
+			output: result.output,
+			exitCode: result.exitCode,
+			cancelled: result.cancelled,
+			truncated: result.truncated,
+			fullOutputPath: result.fullOutputPath,
+			timestamp: Date.now(),
+			excludeFromContext: options?.excludeFromContext,
+		};
+
+		// If agent is streaming, defer adding to avoid breaking tool_use/tool_result ordering
+		if (this.isStreaming) {
+			this._pendingPythonMessages.push(pythonMessage);
+		} else {
+			this.agent.appendMessage(pythonMessage);
+			this.sessionManager.appendMessage(pythonMessage);
+		}
+	}
+
+	/**
+	 * Cancel running Python execution.
+	 */
+	abortPython(): void {
+		this._pythonAbortController?.abort();
+	}
+
+	/** Whether a Python execution is currently running */
+	get isPythonRunning(): boolean {
+		return this._pythonAbortController !== undefined;
+	}
+
+	/** Whether there are pending Python messages waiting to be flushed */
+	get hasPendingPythonMessages(): boolean {
+		return this._pendingPythonMessages.length > 0;
+	}
+
+	/**
+	 * Flush pending Python messages to agent state and session.
+	 */
+	private _flushPendingPythonMessages(): void {
+		if (this._pendingPythonMessages.length === 0) return;
+
+		for (const pythonMessage of this._pendingPythonMessages) {
+			this.agent.appendMessage(pythonMessage);
+			this.sessionManager.appendMessage(pythonMessage);
+		}
+
+		this._pendingPythonMessages = [];
+	}
+
 	// =========================================================================
 	// Session Management
 	// =========================================================================
@@ -3059,6 +3181,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.
 	 */
@@ -3163,6 +3293,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");
@@ -3191,8 +3351,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");
 					}
 				}
@@ -3212,6 +3372,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");
 			}
 		}