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

package/CHANGELOG.md

@@ -2,6 +2,63 @@
 
 ## [Unreleased]
 
+## [7.0.0] - 2026-01-21
+### Added
+
+- Added usage report deduplication to prevent duplicate account entries
+- Added debug logging for usage fetch operations to aid diagnostics
+- Added provider sorting in usage display by total usage amount
+- Added `isolated` parameter to task tool for running each task in separate git worktrees
+- Added git worktree management for isolated task execution with patch generation
+- Added patch application system that applies changes only when all patches are valid
+- Added working directory information to environment info display
+- Added `/usage` command to display provider usage and limits
+- Added support for multiple usage providers beyond Codex
+- Added usage report caching with configurable TTL
+- Added visual usage bars and account aggregation in usage display
+- Added `fetchUsageReports()` method to agent session
+- Added `output()` function to read task/agent outputs by ID with support for multiple formats and queries
+- Added session file support to Python executor for accessing task outputs
+- Added support for jq-like queries when reading JSON outputs
+- Added offset and limit parameters for reading specific line ranges from outputs
+- Added "." and "c" shortcuts to continue agent without sending visible message
+- Added debug logging for usage fetch results to aid /usage diagnostics
+
+### Changed
+
+- Updated discoverSkills function to return object with skills property
+- Enhanced usage report merging to combine limits and metadata from duplicate accounts
+- Improved OAuth credential handling to preserve existing fields when updating
+- Removed cd function from Python prelude to encourage using cwd parameter
+- Updated task tool to generate and apply patches when running in isolated mode
+- Enhanced task tool rendering to display isolated execution status and patch paths
+- Updated system prompt structure and formatting for better readability
+- Reorganized tool hierarchy and discipline sections
+- Added parallel work guidance for task-based workflows
+- Enhanced verification and integration methodology sections
+- Updated skills and rules formatting for cleaner presentation
+- Added stronger emphasis on completeness and quality standards
+- Refactored usage tracking from Codex-specific to generic provider system
+- Updated usage limit detection to work with multiple provider APIs
+- Changed usage cache to use persistent storage instead of in-memory only
+- Limited diagnostic messages to 50 items to prevent overwhelming output when processing files with many issues
+- Changed `/dump` command to include complete agent context: system prompt, model config, available tools with schemas, and all message types (bash/python executions, custom messages, branch summaries, compaction summaries, file mentions)
+- Changed `/dump` format to use YAML instead of JSON for tool schemas and arguments (more readable)
+
+### Fixed
+
+- Fixed TypeScript error in bash executor by properly typing caught exception
+- Fixed usage display ordering to show providers with lowest usage first
+- Fixed task tool result rendering to show fallback text when no results are available
+- Fixed external editor to work properly on Unix systems by correctly handling terminal I/O
+- Fixed external editor to show warning message when it fails to open instead of silently failing
+- Fixed find tool to properly handle no matches case without treating as error
+- Fixed find tool to wait for fd exit so error messages no longer report exit null
+- Fixed read tool to properly handle no matches case without treating as error
+- Fixed orphaned Python kernel gateway processes not being killed on process exit
+- Fixed /usage provider ordering to sort by aggregate usage (most used last)
+- Fixed /usage account dedupe to collapse identical accounts using usage metadata
+
 ## [6.9.69] - 2026-01-21
 
 ### Added
@@ -44,6 +101,7 @@
 - Fixed patch indentation normalization for fuzzy matches, tab/space diffs, and ambiguous context alignment
 
 ## [6.9.0] - 2026-01-21
+
 ### Removed
 
 - Removed Git tool and all related functionality
@@ -54,6 +112,7 @@
 - Removed @oh-my-pi/pi-git-tool dependency
 
 ## [6.8.5] - 2026-01-21
+
 ### Breaking Changes
 
 - Changed timeout parameter from seconds to milliseconds in Python tool
@@ -65,6 +124,7 @@
 - Improved streaming output handling and buffer management
 
 ## [6.8.4] - 2026-01-21
+
 ### Changed
 
 - Updated output sink to properly handle large outputs
@@ -146,6 +206,7 @@
 - Updated temporary file cleanup to use secure async removal methods
 
 ## [6.7.67] - 2026-01-19
+
 ### Added
 
 - Added normative rewrite setting to control tool call argument normalization in session history
@@ -194,7 +255,7 @@
 
 - Patch application handles repeated context blocks, preserves original indentation on fuzzy match
 - Ambiguous context matching resolves duplicates using adjacent @@ anchor positioning
-- Patch parser handles bare *** terminators, model hallucination markers, line hint ranges
+- Patch parser handles bare \*\*\* terminators, model hallucination markers, line hint ranges
 - Function context matching handles signatures with and without empty parentheses
 - Fixed session title generation to respect OMP_NO_TITLE environment variable
 - Fixed Python module discovery to use import.meta.dir for ES module compatibility
@@ -206,6 +267,7 @@
 - Fixed MCP tool path formatting to correctly display provider information
 
 ## [6.2.0] - 2026-01-19
+
 ### Changed
 
 - Improved LSP batching to coalesce formatting and diagnostics for parallel edits
@@ -243,12 +305,14 @@
 - Fixed TTSR abbreviation expansion from TTSR to Time Traveling Stream Rules
 
 ## [5.8.0] - 2026-01-19
+
 ### Changed
 
 - Updated WASM loading to use streaming for development environments with base64 fallback
 - Added scripts directory to published package files
 
 ## [5.7.68] - 2026-01-18
+
 ### Changed
 
 - Updated WASM loading to use base64-encoded WASM for better compatibility with compiled binaries
@@ -258,12 +322,14 @@
 - Fixed WASM loading issues in compiled binary builds
 
 ## [5.7.67] - 2026-01-18
+
 ### Changed
 
 - Replaced external photon-node dependency with vendored WebAssembly implementation
 - Updated image processing to use local photon library for better performance
 
 ## [5.6.70] - 2026-01-18
+
 ### Added
 
 - Added support for loading Python prelude extension modules from user and project directories
@@ -336,7 +402,7 @@
 - Enhanced Python kernel availability checking with faster validation
 - Optimized Python environment warming to avoid blocking during tool initialization
 - Reorganized settings interface into behavior, tools, display, voice, status, lsp, and exa tabs
-- Migrated environment variables from PI_ to OMP_ prefix with automatic migration
+- Migrated environment variables from PI* to OMP* prefix with automatic migration
 - Updated model selector to use TabBar component for provider navigation
 - Changed role badges to inverted style with colored backgrounds
 - Added support for /models command alias in addition to /model
@@ -369,11 +435,13 @@
 - Enhanced Python gateway environment filtering to exclude sensitive API keys and Windows system paths
 
 ## [5.5.0] - 2026-01-18
+
 ### Changed
 
 - Updated task execution guidelines to improve prompt framing and parallelization instructions
 
 ## [5.4.2] - 2026-01-16
+
 ### Changed
 
 - Updated model resolution to accept pre-serialized settings for better performance
@@ -381,11 +449,13 @@
 - Enhanced edit tool documentation with clear use cases for bash alternatives
 
 ## [5.3.0] - 2026-01-15
+
 ### Changed
 
 - Expanded bash tool guidance to explicitly list appropriate use cases including file operations, build commands, and process management
 
 ## [5.2.1] - 2026-01-14
+
 ### Fixed
 
 - Fixed stale diagnostic results by tracking diagnostic versions before file sync operations
@@ -429,6 +499,7 @@
 - Fixed session selector page up/down navigation
 
 ## [5.0.1] - 2026-01-12
+
 ### Changed
 
 - Replaced wasm-vips with Photon for more stable WASM image processing
@@ -455,6 +526,7 @@
 - Move `sharp` to optional dependencies with all platform binaries to fix arm64 runtime errors
 
 ## [4.7.0] - 2026-01-12
+
 ### Added
 
 - Add `omp config` subcommand for managing settings (`list`, `get`, `set`, `reset`, `path`)
@@ -474,6 +546,7 @@
 ## [4.6.0] - 2026-01-12
 
 ### Added
+
 - Add `/skill:name` slash commands for quick skill access (toggle via `skills.enableSkillCommands` setting)
 - Add `cwd` to SessionInfo for session list display
 - Add custom summarization instructions option in tree selector
@@ -481,10 +554,12 @@
 - Add `shutdownRequested` and `checkShutdownRequested()` for extension-initiated shutdown
 
 ### Fixed
+
 - Component `invalidate()` now properly rebuilds content on theme changes
 - Force full re-render after returning from external editor
 
 ## [4.4.8] - 2026-01-12
+
 ### Changed
 
 - Changed review finding priority format from numeric (0-3) to string labels (P0-P3) for clearer severity indication
@@ -504,6 +579,7 @@
 - Fixed frontmatter parsing to properly report source location when YAML parsing fails
 
 ## [4.4.4] - 2026-01-11
+
 ### Added
 
 - Added `todo_write` tool for creating and managing structured task lists during coding sessions
@@ -534,6 +610,7 @@
 - Fixed prompt template loading to strip leading HTML comment metadata blocks
 
 ## [4.3.2] - 2026-01-11
+
 ### Changed
 
 - Increased default bash output preview from 5 to 10 lines when collapsed
@@ -573,6 +650,7 @@
 - Fixed serialized auth storage initialization so OAuth refreshes in subagents don't crash
 
 ## [4.2.2] - 2026-01-11
+
 ### Added
 
 - Added persistent cache storage for Codex usage data that survives application restarts
@@ -593,6 +671,7 @@
 - Removed `planner` agent command template, consolidating planning functionality into the `plan` agent
 
 ## [4.2.1] - 2026-01-11
+
 ### Added
 
 - Added automatic discovery and listing of AGENTS.md files in the system prompt, providing agents with an authoritative list of project-specific instruction files without runtime searching
@@ -659,6 +738,7 @@
 - Hardened file permissions on agent database directory (700) and database file (600) to restrict access
 
 ## [4.1.0] - 2026-01-10
+
 ### Added
 
 - Added persistent prompt history with SQLite-backed storage and Ctrl+R search
@@ -668,6 +748,7 @@
 - Fixed credential blocking logic to correctly check for remaining available credentials instead of always returning true
 
 ## [4.0.1] - 2026-01-10
+
 ### Added
 
 - Added usage limit error detection to enable automatic credential switching when Codex accounts hit rate limits
@@ -771,11 +852,13 @@
 - Extension directories in `settings.json` respect `package.json` manifests
 
 ## [3.37.0] - 2026-01-10
+
 ### Changed
 
 - Improved bash command display to show relative paths for working directories within the current directory, and hide redundant `cd` prefix when working directory matches current directory
 
 ## [3.36.0] - 2026-01-10
+
 ### Added
 
 - Added `calc` tool for basic mathematical calculations with support for arithmetic operators, parentheses, and hex/binary/octal literals
@@ -794,6 +877,7 @@
 - Improved completion notification message to include session title when available
 
 ## [3.35.0] - 2026-01-09
+
 ### Added
 
 - Added retry logic with exponential backoff for auto-compaction failures
@@ -1871,15 +1955,14 @@ Total color count increased from 46 to 50. See [docs/theme.md](docs/theme.md) fo
 - **Credential storage refactored**: API keys and OAuth tokens are now stored in `~/.omp/agent/auth.json` instead of `oauth.json` and `settings.json`. Existing credentials are automatically migrated on first run. ([#296](https://github.com/badlogic/pi-mono/issues/296))
 
 - **SDK API changes** ([#296](https://github.com/badlogic/pi-mono/issues/296)):
-
-  - Added `AuthStorage` class for credential management (API keys and OAuth tokens)
-  - Added `ModelRegistry` class for model discovery and API key resolution
-  - Added `discoverAuthStorage()` and `discoverModels()` discovery functions
-  - `createAgentSession()` now accepts `authStorage` and `modelRegistry` options
-  - Removed `configureOAuthStorage()`, `defaultGetApiKey()`, `findModel()`, `discoverAvailableModels()`
-  - Removed `getApiKey` callback option (use `AuthStorage.setRuntimeApiKey()` for runtime overrides)
-  - Use `getModel()` from `@oh-my-pi/pi-ai` for built-in models, `modelRegistry.find()` for custom models + built-in models
-  - See updated [SDK documentation](docs/sdk.md) and [README](README.md)
+   - Added `AuthStorage` class for credential management (API keys and OAuth tokens)
+   - Added `ModelRegistry` class for model discovery and API key resolution
+   - Added `discoverAuthStorage()` and `discoverModels()` discovery functions
+   - `createAgentSession()` now accepts `authStorage` and `modelRegistry` options
+   - Removed `configureOAuthStorage()`, `defaultGetApiKey()`, `findModel()`, `discoverAvailableModels()`
+   - Removed `getApiKey` callback option (use `AuthStorage.setRuntimeApiKey()` for runtime overrides)
+   - Use `getModel()` from `@oh-my-pi/pi-ai` for built-in models, `modelRegistry.find()` for custom models + built-in models
+   - See updated [SDK documentation](docs/sdk.md) and [README](README.md)
 
 - **Settings changes**: Removed `apiKeys` from `settings.json`. Use `auth.json` instead. ([#296](https://github.com/badlogic/pi-mono/issues/296))
 
@@ -1910,16 +1993,15 @@ Total color count increased from 46 to 50. See [docs/theme.md](docs/theme.md) fo
 ### Added
 
 - **Compaction hook improvements**: The `before_compact` session event now includes:
-
-  - `previousSummary`: Summary from the last compaction (if any), so hooks can preserve accumulated context
-  - `messagesToKeep`: Messages that will be kept after the summary (recent turns), in addition to `messagesToSummarize`
-  - `resolveApiKey`: Function to resolve API keys for any model (checks settings, OAuth, env vars)
-  - Removed `apiKey` string in favor of `resolveApiKey` for more flexibility
+   - `previousSummary`: Summary from the last compaction (if any), so hooks can preserve accumulated context
+   - `messagesToKeep`: Messages that will be kept after the summary (recent turns), in addition to `messagesToSummarize`
+   - `resolveApiKey`: Function to resolve API keys for any model (checks settings, OAuth, env vars)
+   - Removed `apiKey` string in favor of `resolveApiKey` for more flexibility
 
 - **SessionManager API cleanup**:
-  - Renamed `loadSessionFromEntries()` to `buildSessionContext()` (builds LLM context from entries, handling compaction)
-  - Renamed `loadEntries()` to `getEntries()` (returns defensive copy of all session entries)
-  - Added `buildSessionContext()` method to SessionManager
+   - Renamed `loadSessionFromEntries()` to `buildSessionContext()` (builds LLM context from entries, handling compaction)
+   - Renamed `loadEntries()` to `getEntries()` (returns defensive copy of all session entries)
+   - Added `buildSessionContext()` method to SessionManager
 
 ## [0.27.5] - 2025-12-24
 
@@ -2138,13 +2220,13 @@ Total color count increased from 46 to 50. See [docs/theme.md](docs/theme.md) fo
 - **Custom tools now require `index.ts` entry point**: Auto-discovered custom tools must be in a subdirectory with an `index.ts` file. The old pattern `~/.omp/agent/tools/mytool.ts` must become `~/.omp/agent/tools/mytool/index.ts`. This allows multi-file tools to import helper modules. Explicit paths via `--tool` or `settings.json` still work with any `.ts` file.
 
 - **Hook `tool_result` event restructured**: The `ToolResultEvent` now exposes full tool result data instead of just text. ([#233](https://github.com/badlogic/pi-mono/pull/233))
-  - Removed: `result: string` field
-  - Added: `content: (TextContent | ImageContent)[]` - full content array
-  - Added: `details: unknown` - tool-specific details (typed per tool via discriminated union on `toolName`)
-  - `ToolResultEventResult.result` renamed to `ToolResultEventResult.text` (removed), use `content` instead
-  - Hook handlers returning `{ result: "..." }` must change to `{ content: [{ type: "text", text: "..." }] }`
-  - Built-in tool details types exported: `BashToolDetails`, `ReadToolDetails`, `GrepToolDetails`, `FindToolDetails`, `LsToolDetails`, `TruncationResult`
-  - Type guards exported for narrowing: `isBashToolResult`, `isReadToolResult`, `isEditToolResult`, `isWriteToolResult`, `isGrepToolResult`, `isFindToolResult`, `isLsToolResult`
+   - Removed: `result: string` field
+   - Added: `content: (TextContent | ImageContent)[]` - full content array
+   - Added: `details: unknown` - tool-specific details (typed per tool via discriminated union on `toolName`)
+   - `ToolResultEventResult.result` renamed to `ToolResultEventResult.text` (removed), use `content` instead
+   - Hook handlers returning `{ result: "..." }` must change to `{ content: [{ type: "text", text: "..." }] }`
+   - Built-in tool details types exported: `BashToolDetails`, `ReadToolDetails`, `GrepToolDetails`, `FindToolDetails`, `LsToolDetails`, `TruncationResult`
+   - Type guards exported for narrowing: `isBashToolResult`, `isReadToolResult`, `isEditToolResult`, `isWriteToolResult`, `isGrepToolResult`, `isFindToolResult`, `isLsToolResult`
 
 ## [0.23.4] - 2025-12-18
 
@@ -2173,13 +2255,12 @@ Total color count increased from 46 to 50. See [docs/theme.md](docs/theme.md) fo
 - Improved system prompt documentation section with clearer pointers to specific doc files for custom models, themes, skills, hooks, custom tools, and RPC.
 
 - Cleaned up documentation:
-
-  - `theme.md`: Added missing color tokens (`thinkingXhigh`, `bashMode`)
-  - `skills.md`: Rewrote with better framing and examples
-  - `hooks.md`: Fixed timeout/error handling docs, added import aliases section
-  - `custom-tools.md`: Added intro with use cases and comparison table
-  - `rpc.md`: Added missing `hook_error` event documentation
-  - `README.md`: Complete settings table, condensed philosophy section, standardized OAuth docs
+   - `theme.md`: Added missing color tokens (`thinkingXhigh`, `bashMode`)
+   - `skills.md`: Rewrote with better framing and examples
+   - `hooks.md`: Fixed timeout/error handling docs, added import aliases section
+   - `custom-tools.md`: Added intro with use cases and comparison table
+   - `rpc.md`: Added missing `hook_error` event documentation
+   - `README.md`: Complete settings table, condensed philosophy section, standardized OAuth docs
 
 - Hooks loader now supports same import aliases as custom tools (`@sinclair/typebox`, `@oh-my-pi/pi-ai`, `@oh-my-pi/pi-tui`, `@oh-my-pi/pi-coding-agent`).
 
@@ -2436,12 +2517,12 @@ _Dedicated to Peter's shoulder ([@steipete](https://twitter.com/steipete))_
 ### Changed
 
 - **Tool output truncation**: All tools now enforce consistent truncation limits with actionable notices for the LLM. ([#134](https://github.com/badlogic/pi-mono/issues/134))
-  - **Limits**: 2000 lines OR 50KB (whichever hits first), never partial lines
-  - **read**: Shows `[Showing lines X-Y of Z. Use offset=N to continue]`. If first line exceeds 50KB, suggests bash command
-  - **bash**: Tail truncation with temp file. Shows `[Showing lines X-Y of Z. Full output: /tmp/...]`
-  - **grep**: Pre-truncates match lines to 500 chars. Shows match limit and line truncation notices
-  - **find/ls**: Shows result/entry limit notices
-  - TUI displays truncation warnings in yellow at bottom of tool output (visible even when collapsed)
+   - **Limits**: 2000 lines OR 50KB (whichever hits first), never partial lines
+   - **read**: Shows `[Showing lines X-Y of Z. Use offset=N to continue]`. If first line exceeds 50KB, suggests bash command
+   - **bash**: Tail truncation with temp file. Shows `[Showing lines X-Y of Z. Full output: /tmp/...]`
+   - **grep**: Pre-truncates match lines to 500 chars. Shows match limit and line truncation notices
+   - **find/ls**: Shows result/entry limit notices
+   - TUI displays truncation warnings in yellow at bottom of tool output (visible even when collapsed)
 
 ## [0.13.1] - 2025-12-06
 
@@ -2528,13 +2609,13 @@ _Dedicated to Peter's shoulder ([@steipete](https://twitter.com/steipete))_
 ### Added
 
 - **Context Compaction**: Long sessions can now be compacted to reduce context usage while preserving recent conversation history. ([#92](https://github.com/badlogic/pi-mono/issues/92), [docs](https://github.com/badlogic/pi-mono/blob/main/packages/coding-agent/README.md#context-compaction))
-  - `/compact [instructions]`: Manually compact context with optional custom instructions for the summary
-  - `/autocompact`: Toggle automatic compaction when context exceeds threshold
-  - Compaction summarizes older messages while keeping recent messages (default 20k tokens) verbatim
-  - Auto-compaction triggers when context reaches `contextWindow - reserveTokens` (default 16k reserve)
-  - Compacted sessions show a collapsible summary in the TUI (toggle with `o` key)
-  - HTML exports include compaction summaries as collapsible sections
-  - RPC mode supports `{"type":"compact"}` command and auto-compaction (emits compaction events)
+   - `/compact [instructions]`: Manually compact context with optional custom instructions for the summary
+   - `/autocompact`: Toggle automatic compaction when context exceeds threshold
+   - Compaction summarizes older messages while keeping recent messages (default 20k tokens) verbatim
+   - Auto-compaction triggers when context reaches `contextWindow - reserveTokens` (default 16k reserve)
+   - Compacted sessions show a collapsible summary in the TUI (toggle with `o` key)
+   - HTML exports include compaction summaries as collapsible sections
+   - RPC mode supports `{"type":"compact"}` command and auto-compaction (emits compaction events)
 - **Branch Source Tracking**: Branched sessions now store `branchedFrom` in the session header, containing the path to the original session file. Useful for tracing session lineage.
 
 ## [0.12.5] - 2025-12-03
@@ -2571,11 +2652,11 @@ _Dedicated to Peter's shoulder ([@steipete](https://twitter.com/steipete))_
 ### Added
 
 - **Models**: Added support for OpenAI's new models:
-  - `gpt-4.1` (128K context)
-  - `gpt-4.1-mini` (128K context)
-  - `gpt-4.1-nano` (128K context)
-  - `o3` (200K context, reasoning model)
-  - `o4-mini` (200K context, reasoning model)
+   - `gpt-4.1` (128K context)
+   - `gpt-4.1-mini` (128K context)
+   - `gpt-4.1-nano` (128K context)
+   - `o3` (200K context, reasoning model)
+   - `o4-mini` (200K context, reasoning model)
 
 ## [0.12.0] - 2025-12-02
 

package/examples/sdk/04-skills.ts

@@ -8,7 +8,7 @@
 import { createAgentSession, discoverSkills, SessionManager, type Skill } from "@oh-my-pi/pi-coding-agent";
 
 // Discover all skills from cwd/.omp/skills, ~/.omp/agent/skills, etc.
-const allSkills = discoverSkills();
+const { skills: allSkills } = await discoverSkills();
 console.log(
 	"Discovered skills:",
 	allSkills.map((s) => s.name),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "6.9.69",
+	"version": "7.0.0",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"type": "module",
 	"ompConfig": {
@@ -40,11 +40,11 @@
 		"prepublishOnly": "bun run generate-template && bun run clean && bun run build"
 	},
 	"dependencies": {
-		"@oh-my-pi/omp-stats": "6.9.69",
-		"@oh-my-pi/pi-agent-core": "6.9.69",
-		"@oh-my-pi/pi-ai": "6.9.69",
-		"@oh-my-pi/pi-tui": "6.9.69",
-		"@oh-my-pi/pi-utils": "6.9.69",
+		"@oh-my-pi/omp-stats": "7.0.0",
+		"@oh-my-pi/pi-agent-core": "7.0.0",
+		"@oh-my-pi/pi-ai": "7.0.0",
+		"@oh-my-pi/pi-tui": "7.0.0",
+		"@oh-my-pi/pi-utils": "7.0.0",
 		"@openai/agents": "^0.3.7",
 		"@sinclair/typebox": "^0.34.46",
 		"ajv": "^8.17.1",

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,7 +60,17 @@ 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, PythonExecutionMessage } 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";
@@ -3161,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.
 	 */
@@ -3265,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");
@@ -3293,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");
 					}
 				}
@@ -3314,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");
 			}
 		}