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

package/src/modes/{interactive/controllers → controllers}/selector-controller.ts

@@ -2,22 +2,22 @@ import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { OAuthProvider } from "@oh-my-pi/pi-ai";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Input, Loader, Spacer, Text } from "@oh-my-pi/pi-tui";
-import { getAgentDbPath } from "../../../config";
-import { SessionManager } from "../../../core/session-manager";
-import { setPreferredImageProvider, setPreferredWebSearchProvider } from "../../../core/tools/index";
-import { disableProvider, enableProvider } from "../../../discovery";
-import { AssistantMessageComponent } from "../components/assistant-message";
-import { ExtensionDashboard } from "../components/extensions";
-import { HistorySearchComponent } from "../components/history-search";
-import { ModelSelectorComponent } from "../components/model-selector";
-import { OAuthSelectorComponent } from "../components/oauth-selector";
-import { SessionSelectorComponent } from "../components/session-selector";
-import { SettingsSelectorComponent } from "../components/settings-selector";
-import { ToolExecutionComponent } from "../components/tool-execution";
-import { TreeSelectorComponent } from "../components/tree-selector";
-import { UserMessageSelectorComponent } from "../components/user-message-selector";
-import { getAvailableThemes, getSymbolTheme, setSymbolPreset, setTheme, theme } from "../theme/theme";
-import type { InteractiveModeContext } from "../types";
+import { getAgentDbPath } from "$c/config";
+import { disableProvider, enableProvider } from "$c/discovery";
+import { AssistantMessageComponent } from "$c/modes/components/assistant-message";
+import { ExtensionDashboard } from "$c/modes/components/extensions";
+import { HistorySearchComponent } from "$c/modes/components/history-search";
+import { ModelSelectorComponent } from "$c/modes/components/model-selector";
+import { OAuthSelectorComponent } from "$c/modes/components/oauth-selector";
+import { SessionSelectorComponent } from "$c/modes/components/session-selector";
+import { SettingsSelectorComponent } from "$c/modes/components/settings-selector";
+import { ToolExecutionComponent } from "$c/modes/components/tool-execution";
+import { TreeSelectorComponent } from "$c/modes/components/tree-selector";
+import { UserMessageSelectorComponent } from "$c/modes/components/user-message-selector";
+import { getAvailableThemes, getSymbolTheme, setSymbolPreset, setTheme, theme } from "$c/modes/theme/theme";
+import type { InteractiveModeContext } from "$c/modes/types";
+import { SessionManager } from "$c/session/session-manager";
+import { setPreferredImageProvider, setPreferredWebSearchProvider } from "$c/tools/index";
 
 export class SelectorController {
 	constructor(private ctx: InteractiveModeContext) {}

package/src/modes/index.ts

@@ -1,7 +1,7 @@
 /**
  * Run modes for the coding agent.
  */
-export { InteractiveMode, type InteractiveModeOptions } from "./interactive/interactive-mode";
+export { InteractiveMode, type InteractiveModeOptions } from "./interactive-mode";
 export { type PrintModeOptions, runPrintMode } from "./print-mode";
 export { type ModelInfo, RpcClient, type RpcClientOptions, type RpcEventListener } from "./rpc/rpc-client";
 export { runRpcMode } from "./rpc/rpc-mode";

package/src/modes/{interactive/interactive-mode.ts → interactive-mode.ts}

@@ -5,7 +5,7 @@
 
 import * as path from "node:path";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
-import type { AssistantMessage, ImageContent, Message } from "@oh-my-pi/pi-ai";
+import type { AssistantMessage, ImageContent, Message, UsageReport } from "@oh-my-pi/pi-ai";
 import type { Component, Loader, SlashCommand } from "@oh-my-pi/pi-tui";
 import {
 	CombinedAutocompleteProvider,
@@ -18,16 +18,16 @@ import {
 } from "@oh-my-pi/pi-tui";
 import { logger, postmortem } from "@oh-my-pi/pi-utils";
 import chalk from "chalk";
-import type { AgentSession, AgentSessionEvent } from "../../core/agent-session";
-import type { ExtensionUIContext } from "../../core/extensions/index";
-import type { CompactOptions } from "../../core/extensions/types";
-import { HistoryStorage } from "../../core/history-storage";
-import { KeybindingsManager } from "../../core/keybindings";
-import type { SessionContext, SessionManager } from "../../core/session-manager";
-import { getRecentSessions } from "../../core/session-manager";
-import type { SettingsManager } from "../../core/settings-manager";
-import { loadSlashCommands } from "../../core/slash-commands";
-import { setTerminalTitle } from "../../core/title-generator";
+import { KeybindingsManager } from "$c/config/keybindings";
+import type { SettingsManager } from "$c/config/settings-manager";
+import type { ExtensionUIContext } from "$c/extensibility/extensions/index";
+import type { CompactOptions } from "$c/extensibility/extensions/types";
+import { loadSlashCommands } from "$c/extensibility/slash-commands";
+import type { AgentSession, AgentSessionEvent } from "$c/session/agent-session";
+import { HistoryStorage } from "$c/session/history-storage";
+import type { SessionContext, SessionManager } from "$c/session/session-manager";
+import { getRecentSessions } from "$c/session/session-manager";
+import { setTerminalTitle } from "$c/utils/title-generator";
 import type { AssistantMessageComponent } from "./components/assistant-message";
 import type { BashExecutionComponent } from "./components/bash-execution";
 import { CustomEditor } from "./components/custom-editor";
@@ -124,7 +124,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	private readonly changelogMarkdown: string | undefined;
 	public readonly lspServers: Array<{ name: string; status: "ready" | "error"; fileTypes: string[] }> | undefined =
 		undefined;
-	public mcpManager?: import("../../core/mcp/index").MCPManager;
+	public mcpManager?: import("$c/mcp/index").MCPManager;
 	private readonly toolUiContextSetter: (uiContext: ExtensionUIContext, hasUI: boolean) => void;
 
 	private readonly commandController: CommandController;
@@ -140,7 +140,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		changelogMarkdown: string | undefined = undefined,
 		setToolUIContext: (uiContext: ExtensionUIContext, hasUI: boolean) => void = () => {},
 		lspServers: Array<{ name: string; status: "ready" | "error"; fileTypes: string[] }> | undefined = undefined,
-		mcpManager?: import("../../core/mcp/index").MCPManager,
+		mcpManager?: import("$c/mcp/index").MCPManager,
 	) {
 		this.session = session;
 		this.sessionManager = session.sessionManager;
@@ -187,6 +187,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			{ name: "share", description: "Share session as a secret GitHub gist" },
 			{ name: "copy", description: "Copy last agent message to clipboard" },
 			{ name: "session", description: "Show session info and stats" },
+			{ name: "usage", description: "Show provider usage and limits" },
 			{ name: "extensions", description: "Open Extension Control Center dashboard" },
 			{ name: "status", description: "Alias for /extensions" },
 			{ name: "changelog", description: "Show changelog entries" },
@@ -395,7 +396,7 @@ export class InteractiveMode implements InteractiveModeContext {
 
 	private formatTodoLine(todo: TodoItem, prefix: string): string {
 		const checkbox = theme.checkbox;
-		const label = todo.status === "in_progress" ? todo.activeForm : todo.content;
+		const label = todo.content;
 		switch (todo.status) {
 			case "completed":
 				return theme.fg("success", `${prefix}${checkbox.checked} ${chalk.strikethrough(todo.content)}`);
@@ -498,7 +499,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		}
 
 		this.stop();
-		process.exit(0);
+		await postmortem.quit(0);
 	}
 
 	async checkShutdownRequested(): Promise<void> {
@@ -613,6 +614,10 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.commandController.handleSessionCommand();
 	}
 
+	handleUsageCommand(reports?: UsageReport[] | null): Promise<void> {
+		return this.commandController.handleUsageCommand(reports);
+	}
+
 	handleChangelogCommand(): void {
 		this.commandController.handleChangelogCommand();
 	}

package/src/modes/print-mode.ts

@@ -7,7 +7,7 @@
  */
 
 import type { AssistantMessage, ImageContent } from "@oh-my-pi/pi-ai";
-import type { AgentSession } from "../core/agent-session";
+import type { AgentSession } from "$c/session/agent-session";
 
 /**
  * Options for print mode.

package/src/modes/rpc/rpc-client.ts

@@ -7,9 +7,9 @@
 import type { AgentEvent, AgentMessage, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent } from "@oh-my-pi/pi-ai";
 import { createSanitizerStream, createSplitterStream, createTextDecoderStream, ptree } from "@oh-my-pi/pi-utils";
-import type { SessionStats } from "../../core/agent-session";
-import type { BashResult } from "../../core/bash-executor";
-import type { CompactionResult } from "../../core/compaction/index";
+import type { BashResult } from "$c/exec/bash-executor";
+import type { SessionStats } from "$c/session/agent-session";
+import type { CompactionResult } from "$c/session/compaction/index";
 import type { RpcCommand, RpcResponse, RpcSessionState } from "./rpc-types";
 
 /** Distributive Omit that works with union types */

package/src/modes/rpc/rpc-mode.ts

@@ -13,9 +13,9 @@
 
 import { readLines } from "@oh-my-pi/pi-utils";
 import { nanoid } from "nanoid";
-import type { AgentSession } from "../../core/agent-session";
-import type { ExtensionUIContext, ExtensionUIDialogOptions } from "../../core/extensions/index";
-import { type Theme, theme } from "../interactive/theme/theme";
+import type { ExtensionUIContext, ExtensionUIDialogOptions } from "$c/extensibility/extensions/index";
+import { type Theme, theme } from "$c/modes/theme/theme";
+import type { AgentSession } from "$c/session/agent-session";
 import type {
 	RpcCommand,
 	RpcExtensionUIRequest,

package/src/modes/rpc/rpc-types.ts

@@ -7,9 +7,9 @@
 
 import type { AgentMessage, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent, Model } from "@oh-my-pi/pi-ai";
-import type { SessionStats } from "../../core/agent-session";
-import type { BashResult } from "../../core/bash-executor";
-import type { CompactionResult } from "../../core/compaction/index";
+import type { BashResult } from "$c/exec/bash-executor";
+import type { SessionStats } from "$c/session/agent-session";
+import type { CompactionResult } from "$c/session/compaction/index";
 
 // ============================================================================
 // RPC Commands (stdin)

package/src/modes/{interactive/theme → theme}/theme.ts

@@ -6,7 +6,7 @@ import { type Static, Type } from "@sinclair/typebox";
 import { TypeCompiler } from "@sinclair/typebox/compiler";
 import chalk from "chalk";
 import { highlight, supportsLanguage } from "cli-highlight";
-import { getCustomThemesDir } from "../../../config";
+import { getCustomThemesDir } from "$c/config";
 // Embed theme JSON files at build time
 import darkThemeJson from "./dark.json" with { type: "json" };
 import { defaultThemes } from "./defaults";

package/src/modes/{interactive/types.ts → types.ts}

@@ -1,14 +1,14 @@
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
-import type { AssistantMessage, ImageContent, Message } from "@oh-my-pi/pi-ai";
+import type { AssistantMessage, ImageContent, Message, UsageReport } from "@oh-my-pi/pi-ai";
 import type { Component, Container, Loader, Spacer, Text, TUI } from "@oh-my-pi/pi-tui";
-import type { AgentSession, AgentSessionEvent } from "../../core/agent-session";
-import type { ExtensionUIContext } from "../../core/extensions/index";
-import type { CompactOptions } from "../../core/extensions/types";
-import type { HistoryStorage } from "../../core/history-storage";
-import type { KeybindingsManager } from "../../core/keybindings";
-import type { MCPManager } from "../../core/mcp/index";
-import type { SessionContext, SessionManager } from "../../core/session-manager";
-import type { SettingsManager } from "../../core/settings-manager";
+import type { KeybindingsManager } from "$c/config/keybindings";
+import type { SettingsManager } from "$c/config/settings-manager";
+import type { ExtensionUIContext } from "$c/extensibility/extensions/index";
+import type { CompactOptions } from "$c/extensibility/extensions/types";
+import type { MCPManager } from "$c/mcp/index";
+import type { AgentSession, AgentSessionEvent } from "$c/session/agent-session";
+import type { HistoryStorage } from "$c/session/history-storage";
+import type { SessionContext, SessionManager } from "$c/session/session-manager";
 import type { AssistantMessageComponent } from "./components/assistant-message";
 import type { BashExecutionComponent } from "./components/bash-execution";
 import type { CustomEditor } from "./components/custom-editor";
@@ -28,7 +28,6 @@ export type CompactionQueuedMessage = {
 export type TodoItem = {
 	id: string;
 	content: string;
-	activeForm: string;
 	status: "pending" | "in_progress" | "completed";
 };
 
@@ -134,6 +133,7 @@ export interface InteractiveModeContext {
 	handleShareCommand(): Promise<void>;
 	handleCopyCommand(): Promise<void>;
 	handleSessionCommand(): void;
+	handleUsageCommand(reports?: UsageReport[] | null): Promise<void>;
 	handleChangelogCommand(): void;
 	handleHotkeysCommand(): void;
 	handleDumpCommand(): Promise<void>;

package/src/modes/{interactive/utils → utils}/ui-helpers.ts

@@ -1,21 +1,20 @@
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { AssistantMessage, Message } from "@oh-my-pi/pi-ai";
 import { Spacer, Text, TruncatedText } from "@oh-my-pi/pi-tui";
-import type { CustomMessage } from "../../../core/messages";
-import type { SessionContext } from "../../../core/session-manager";
-import type { TruncationResult } from "../../../core/tools/truncate";
-import { AssistantMessageComponent } from "../components/assistant-message";
-import { BashExecutionComponent } from "../components/bash-execution";
-import { BranchSummaryMessageComponent } from "../components/branch-summary-message";
-import { CompactionSummaryMessageComponent } from "../components/compaction-summary-message";
-import { CustomMessageComponent } from "../components/custom-message";
-import { DynamicBorder } from "../components/dynamic-border";
-import { PythonExecutionComponent } from "../components/python-execution";
-import { ReadToolGroupComponent } from "../components/read-tool-group";
-import { ToolExecutionComponent } from "../components/tool-execution";
-import { UserMessageComponent } from "../components/user-message";
-import { theme } from "../theme/theme";
-import type { CompactionQueuedMessage, InteractiveModeContext } from "../types";
+import { AssistantMessageComponent } from "$c/modes/components/assistant-message";
+import { BashExecutionComponent } from "$c/modes/components/bash-execution";
+import { BranchSummaryMessageComponent } from "$c/modes/components/branch-summary-message";
+import { CompactionSummaryMessageComponent } from "$c/modes/components/compaction-summary-message";
+import { CustomMessageComponent } from "$c/modes/components/custom-message";
+import { DynamicBorder } from "$c/modes/components/dynamic-border";
+import { PythonExecutionComponent } from "$c/modes/components/python-execution";
+import { ReadToolGroupComponent } from "$c/modes/components/read-tool-group";
+import { ToolExecutionComponent } from "$c/modes/components/tool-execution";
+import { UserMessageComponent } from "$c/modes/components/user-message";
+import { theme } from "$c/modes/theme/theme";
+import type { CompactionQueuedMessage, InteractiveModeContext } from "$c/modes/types";
+import type { CustomMessage } from "$c/session/messages";
+import type { SessionContext } from "$c/session/session-manager";
 
 type TextBlock = { type: "text"; text: string };
 
@@ -75,12 +74,9 @@ export class UiHelpers {
 				if (message.output) {
 					component.appendOutput(message.output);
 				}
-				component.setComplete(
-					message.exitCode,
-					message.cancelled,
-					message.truncated ? ({ truncated: true } as TruncationResult) : undefined,
-					message.fullOutputPath,
-				);
+				component.setComplete(message.exitCode, message.cancelled, {
+					truncation: message.meta?.truncation,
+				});
 				this.ctx.chatContainer.addChild(component);
 				break;
 			}
@@ -89,12 +85,9 @@ export class UiHelpers {
 				if (message.output) {
 					component.appendOutput(message.output);
 				}
-				component.setComplete(
-					message.exitCode,
-					message.cancelled,
-					message.truncated ? ({ truncated: true } as TruncationResult) : undefined,
-					message.fullOutputPath,
-				);
+				component.setComplete(message.exitCode, message.cancelled, {
+					truncation: message.meta?.truncation,
+				});
 				this.ctx.chatContainer.addChild(component);
 				break;
 			}

package/src/{core/tools/patch → patch}/applicator.ts

@@ -7,7 +7,7 @@
 
 import { mkdirSync, unlinkSync } from "node:fs";
 import { dirname } from "node:path";
-import { resolveToCwd } from "../path-utils";
+import { resolveToCwd } from "$c/tools/path-utils";
 import { DEFAULT_FUZZY_THRESHOLD, findContextLine, findMatch, seekSequence } from "./fuzzy";
 import {
 	adjustIndentation,

package/src/{core/tools/patch → patch}/diff.ts

@@ -6,7 +6,7 @@
  */
 
 import * as Diff from "diff";
-import { resolveToCwd } from "../path-utils";
+import { resolveToCwd } from "$c/tools/path-utils";
 import { previewPatch } from "./applicator";
 import { DEFAULT_FUZZY_THRESHOLD, findMatch } from "./fuzzy";
 import { adjustIndentation, normalizeToLF, stripBom } from "./normalize";

package/src/{core/tools/patch → patch}/index.ts

@@ -12,18 +12,19 @@ import { mkdir } from "node:fs/promises";
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import { StringEnum } from "@oh-my-pi/pi-ai";
 import { Type } from "@sinclair/typebox";
-import patchDescription from "../../../prompts/tools/patch.md" with { type: "text" };
-import replaceDescription from "../../../prompts/tools/replace.md" with { type: "text" };
-import { renderPromptTemplate } from "../../prompt-templates";
-import type { ToolSession } from "../index";
+import { renderPromptTemplate } from "$c/config/prompt-templates";
 import {
 	createLspWritethrough,
 	type FileDiagnosticsResult,
 	flushLspWritethroughBatch,
 	type WritethroughCallback,
 	writethroughNoop,
-} from "../lsp/index";
-import { resolveToCwd } from "../path-utils";
+} from "$c/lsp/index";
+import patchDescription from "$c/prompts/tools/patch.md" with { type: "text" };
+import replaceDescription from "$c/prompts/tools/replace.md" with { type: "text" };
+import type { ToolSession } from "$c/tools/index";
+import { outputMeta } from "$c/tools/output-meta";
+import { resolveToCwd } from "$c/tools/path-utils";
 import { applyPatch } from "./applicator";
 import { generateDiffString, generateUnifiedDiffString, replaceText } from "./diff";
 import { DEFAULT_FUZZY_THRESHOLD, findMatch } from "./fuzzy";
@@ -90,30 +91,24 @@ export { ApplyPatchError, EditMatchError, ParseError } from "./types";
 // ═══════════════════════════════════════════════════════════════════════════
 
 const replaceEditSchema = Type.Object({
-	path: Type.String({ description: "Path to the file to edit (relative or absolute)" }),
-	oldText: Type.String({
-		description: "Text to find and replace (high-confidence fuzzy matching for whitespace/indentation is always on)",
-	}),
-	newText: Type.String({ description: "New text to replace the old text with" }),
-	all: Type.Optional(Type.Boolean({ description: "Replace all occurrences instead of requiring unique match" })),
+	path: Type.String({ description: "File path (relative or absolute)" }),
+	old_text: Type.String({ description: "Text to find (fuzzy whitespace matching enabled)" }),
+	new_text: Type.String({ description: "Replacement text" }),
+	all: Type.Optional(Type.Boolean({ description: "Replace all occurrences (default: unique match required)" })),
 });
 
 const patchEditSchema = Type.Object({
-	path: Type.String({ description: "Path to the file" }),
+	path: Type.String({ description: "File path" }),
 	op: Type.Optional(
 		StringEnum(["create", "delete", "update"], {
-			description: "The operation to perform (Defaults to 'update')",
-		}),
-	),
-	rename: Type.Optional(Type.String({ description: "New path, if moving" })),
-	diff: Type.Optional(
-		Type.String({
-			description: "Diff hunk(s) for update. Full content for create.",
+			description: "Operation (default: update)",
 		}),
 	),
+	rename: Type.Optional(Type.String({ description: "New path for move" })),
+	diff: Type.Optional(Type.String({ description: "Diff hunks (update) or full content (create)" })),
 });
 
-export type ReplaceParams = { path: string; oldText: string; newText: string; all?: boolean };
+export type ReplaceParams = { path: string; old_text: string; new_text: string; all?: boolean };
 export type PatchParams = { path: string; op?: string; rename?: string; diff?: string };
 
 // ═══════════════════════════════════════════════════════════════════════════
@@ -331,10 +326,10 @@ export class EditTool implements AgentTool<TInput> {
 				const flushedDiagnostics = await flushLspWritethroughBatch(batchRequest.id, this.session.cwd, signal);
 				diagnostics ??= flushedDiagnostics;
 			}
-			if (diagnostics?.messages?.length) {
-				resultText += `\n\nLSP Diagnostics (${diagnostics.summary}):\n`;
-				resultText += diagnostics.messages.map((d) => `  ${d}`).join("\n");
-			}
+
+			const meta = outputMeta()
+				.diagnostics(diagnostics?.summary ?? "", diagnostics?.messages ?? [])
+				.get();
 
 			return {
 				content: [{ type: "text", text: resultText }],
@@ -344,6 +339,7 @@ export class EditTool implements AgentTool<TInput> {
 					diagnostics,
 					op,
 					rename: effRename,
+					meta,
 				},
 				$normative: normative,
 			};
@@ -352,14 +348,14 @@ export class EditTool implements AgentTool<TInput> {
 		// ─────────────────────────────────────────────────────────────────
 		// Replace mode execution
 		// ─────────────────────────────────────────────────────────────────
-		const { path, oldText, newText, all } = params as ReplaceParams;
+		const { path, old_text, new_text, all } = params as ReplaceParams;
 
 		if (path.endsWith(".ipynb")) {
 			throw new Error("Cannot edit Jupyter notebooks with the Edit tool. Use the NotebookEdit tool instead.");
 		}
 
-		if (oldText.length === 0) {
-			throw new Error("oldText must not be empty.");
+		if (old_text.length === 0) {
+			throw new Error("old_text must not be empty.");
 		}
 
 		const absolutePath = resolveToCwd(path, this.session.cwd);
@@ -373,8 +369,8 @@ export class EditTool implements AgentTool<TInput> {
 		const { bom, text: content } = stripBom(rawContent);
 		const originalEnding = detectLineEnding(content);
 		const normalizedContent = normalizeToLF(content);
-		const normalizedOldText = normalizeToLF(oldText);
-		const normalizedNewText = normalizeToLF(newText);
+		const normalizedOldText = normalizeToLF(old_text);
+		const normalizedNewText = normalizeToLF(new_text);
 
 		const result = replaceText(normalizedContent, normalizedOldText, normalizedNewText, {
 			fuzzy: this.allowFuzzy,
@@ -415,19 +411,18 @@ export class EditTool implements AgentTool<TInput> {
 		const diagnostics = await this.writethrough(absolutePath, finalContent, signal, file, batchRequest);
 		const diffResult = generateDiffString(normalizedContent, result.content);
 
-		let resultText =
+		const resultText =
 			result.count > 1
 				? `Successfully replaced ${result.count} occurrences in ${path}.`
 				: `Successfully replaced text in ${path}.`;
 
-		if (diagnostics?.messages?.length) {
-			resultText += `\n\nLSP Diagnostics (${diagnostics.summary}):\n`;
-			resultText += diagnostics.messages.map((d) => `  ${d}`).join("\n");
-		}
+		const meta = outputMeta()
+			.diagnostics(diagnostics?.summary ?? "", diagnostics?.messages ?? [])
+			.get();
 
 		return {
 			content: [{ type: "text", text: resultText }],
-			details: { diff: diffResult.diff, firstChangedLine: diffResult.firstChangedLine, diagnostics },
+			details: { diff: diffResult.diff, firstChangedLine: diffResult.firstChangedLine, diagnostics, meta },
 		};
 	}
 }

package/src/{core/tools/patch → patch}/shared.ts

@@ -5,10 +5,11 @@
 import type { ToolCallContext } from "@oh-my-pi/pi-agent-core";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
-import { renderDiff as renderDiffColored } from "../../../modes/interactive/components/diff";
-import { getLanguageFromPath, type Theme } from "../../../modes/interactive/theme/theme";
-import type { RenderResultOptions } from "../../custom-tools/types";
-import type { FileDiagnosticsResult } from "../lsp/index";
+import type { RenderResultOptions } from "$c/extensibility/custom-tools/types";
+import type { FileDiagnosticsResult } from "$c/lsp/index";
+import { renderDiff as renderDiffColored } from "$c/modes/components/diff";
+import { getLanguageFromPath, type Theme } from "$c/modes/theme/theme";
+import type { OutputMeta } from "$c/tools/output-meta";
 import {
 	formatExpandHint,
 	formatStatusIcon,
@@ -16,8 +17,8 @@ import {
 	shortenPath,
 	ToolUIKit,
 	truncateDiffByHunk,
-} from "../render-utils";
-import type { RenderCallOptions } from "../renderers";
+} from "$c/tools/render-utils";
+import type { RenderCallOptions } from "$c/tools/renderers";
 import type { DiffError, DiffResult, Operation } from "./types";
 
 // ═══════════════════════════════════════════════════════════════════════════
@@ -55,6 +56,8 @@ export interface EditToolDetails {
 	op?: Operation;
 	/** New path after move/rename (patch mode only) */
 	rename?: string;
+	/** Structured output metadata */
+	meta?: OutputMeta;
 }
 
 // ═══════════════════════════════════════════════════════════════════════════