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

package/src/{core/tools/lsp → lsp}/clients/biome-client.ts

@@ -4,7 +4,7 @@
  */
 
 import path from "node:path";
-import type { Diagnostic, DiagnosticSeverity, LinterClient, ServerConfig } from "../types";
+import type { Diagnostic, DiagnosticSeverity, LinterClient, ServerConfig } from "$c/lsp/types";
 
 // =============================================================================
 // Biome JSON Output Types

package/src/{core/tools/lsp → lsp}/clients/index.ts

@@ -8,7 +8,7 @@
 export { BiomeClient } from "./biome-client";
 export { LspLinterClient } from "./lsp-linter-client";
 
-import type { LinterClient, ServerConfig } from "../types";
+import type { LinterClient, ServerConfig } from "$c/lsp/types";
 import { LspLinterClient } from "./lsp-linter-client";
 
 // Cache of linter clients by server name + cwd

package/src/{core/tools/lsp → lsp}/clients/lsp-linter-client.ts

@@ -3,10 +3,10 @@
  * Uses the Language Server Protocol for formatting and diagnostics.
  */
 
-import { getOrCreateClient, notifySaved, sendRequest, syncContent } from "../client";
-import { applyTextEditsToString } from "../edits";
-import type { Diagnostic, LinterClient, LspClient, ServerConfig, TextEdit } from "../types";
-import { fileToUri } from "../utils";
+import { getOrCreateClient, notifySaved, sendRequest, syncContent } from "$c/lsp/client";
+import { applyTextEditsToString } from "$c/lsp/edits";
+import type { Diagnostic, LinterClient, LspClient, ServerConfig, TextEdit } from "$c/lsp/types";
+import { fileToUri } from "$c/lsp/utils";
 
 /** Default formatting options for LSP */
 const DEFAULT_FORMAT_OPTIONS = {

package/src/{core/tools/lsp → lsp}/config.ts

@@ -3,7 +3,7 @@ import { basename, extname, join } from "node:path";
 import { logger } from "@oh-my-pi/pi-utils";
 import { YAML } from "bun";
 import { globSync } from "glob";
-import { getConfigDirPaths } from "../../../config";
+import { getConfigDirPaths } from "$c/config";
 import { BiomeClient } from "./clients/biome-client";
 import DEFAULTS from "./defaults.json" with { type: "json" };
 import type { ServerConfig } from "./types";

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

@@ -4,11 +4,12 @@ import path from "node:path";
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import { logger, once, untilAborted } from "@oh-my-pi/pi-utils";
 import type { BunFile } from "bun";
-import { type Theme, theme } from "../../../modes/interactive/theme/theme";
-import lspDescription from "../../../prompts/tools/lsp.md" with { type: "text" };
-import { renderPromptTemplate } from "../../prompt-templates";
-import type { ToolSession } from "../index";
-import { resolveToCwd } from "../path-utils";
+import { renderPromptTemplate } from "$c/config/prompt-templates";
+import { type Theme, theme } from "$c/modes/theme/theme";
+import lspDescription from "$c/prompts/tools/lsp.md" with { type: "text" };
+import type { ToolSession } from "$c/tools/index";
+import { resolveToCwd } from "$c/tools/path-utils";
+import { throwIfAborted } from "$c/tools/tool-errors";
 import {
 	ensureFileOpen,
 	getActiveClients,
@@ -152,15 +153,15 @@ async function syncFileContent(
 	servers: Array<[string, ServerConfig]>,
 	signal?: AbortSignal,
 ): Promise<void> {
-	signal?.throwIfAborted();
+	throwIfAborted(signal);
 	await Promise.allSettled(
 		servers.map(async ([_serverName, serverConfig]) => {
-			signal?.throwIfAborted();
+			throwIfAborted(signal);
 			if (serverConfig.createClient) {
 				return;
 			}
 			const client = await getOrCreateClient(serverConfig, cwd);
-			signal?.throwIfAborted();
+			throwIfAborted(signal);
 			await syncContent(client, absolutePath, content, signal);
 		}),
 	);
@@ -180,10 +181,10 @@ async function notifyFileSaved(
 	servers: Array<[string, ServerConfig]>,
 	signal?: AbortSignal,
 ): Promise<void> {
-	signal?.throwIfAborted();
+	throwIfAborted(signal);
 	await Promise.allSettled(
 		servers.map(async ([_serverName, serverConfig]) => {
-			signal?.throwIfAborted();
+			throwIfAborted(signal);
 			if (serverConfig.createClient) {
 				return;
 			}
@@ -342,7 +343,7 @@ async function waitForDiagnostics(
 ): Promise<Diagnostic[]> {
 	const start = Date.now();
 	while (Date.now() - start < timeoutMs) {
-		signal?.throwIfAborted();
+		throwIfAborted(signal);
 		const diagnostics = client.diagnostics.get(uri);
 		const versionOk = minVersion === undefined || client.diagnosticsVersion > minVersion;
 		if (diagnostics !== undefined && versionOk) return diagnostics;
@@ -521,7 +522,7 @@ async function getDiagnosticsForFile(
 	// Wait for diagnostics from all servers in parallel
 	const results = await Promise.allSettled(
 		servers.map(async ([serverName, serverConfig]) => {
-			signal?.throwIfAborted();
+			throwIfAborted(signal);
 			// Use custom linter client if configured
 			if (serverConfig.createClient) {
 				const linterClient = getLinterClient(serverName, serverConfig, cwd);
@@ -531,7 +532,7 @@ async function getDiagnosticsForFile(
 
 			// Default: use LSP
 			const client = await getOrCreateClient(serverConfig, cwd);
-			signal?.throwIfAborted();
+			throwIfAborted(signal);
 			// Content already synced + didSave sent, wait for fresh diagnostics
 			const minVersion = minVersions?.get(serverName);
 			const diagnostics = await waitForDiagnostics(client, uri, 3000, signal, minVersion);
@@ -621,7 +622,7 @@ async function formatContent(
 
 	for (const [serverName, serverConfig] of servers) {
 		try {
-			signal?.throwIfAborted();
+			throwIfAborted(signal);
 			// Use custom linter client if configured
 			if (serverConfig.createClient) {
 				const linterClient = getLinterClient(serverName, serverConfig, cwd);
@@ -630,7 +631,7 @@ async function formatContent(
 
 			// Default: use LSP
 			const client = await getOrCreateClient(serverConfig, cwd);
-			signal?.throwIfAborted();
+			throwIfAborted(signal);
 
 			const caps = client.serverCapabilities;
 			if (!caps?.documentFormattingProvider) {

package/src/{core/tools/lsp → lsp}/render.ts

@@ -11,8 +11,8 @@
 import type { AgentToolResult, RenderResultOptions } from "@oh-my-pi/pi-agent-core";
 import { Text } from "@oh-my-pi/pi-tui";
 import { highlight, supportsLanguage } from "cli-highlight";
-import { getLanguageFromPath, type Theme } from "../../../modes/interactive/theme/theme";
-import { formatExpandHint, formatMoreItems, TRUNCATE_LENGTHS, truncate } from "../render-utils";
+import { getLanguageFromPath, type Theme } from "$c/modes/theme/theme";
+import { formatExpandHint, formatMoreItems, TRUNCATE_LENGTHS, truncate } from "$c/tools/render-utils";
 import type { LspParams, LspToolDetails } from "./types";
 
 // =============================================================================

package/src/{core/tools/lsp → lsp}/types.ts

@@ -30,23 +30,21 @@ export const lspSchema = Type.Object({
 			"related_tests",
 			"reload_workspace",
 		],
-		{ description: "LSP action to perform" },
-	),
-	files: Type.Optional(Type.Array(Type.String({ description: "File paths for diagnostics" }))),
-	file: Type.Optional(Type.String({ description: "File path for file-specific actions" })),
-	line: Type.Optional(Type.Number({ description: "1-based line number" })),
-	column: Type.Optional(Type.Number({ description: "1-based column number" })),
-	end_line: Type.Optional(Type.Number({ description: "1-based end line number for ranges" })),
-	end_character: Type.Optional(Type.Number({ description: "1-based end column number for ranges" })),
-	query: Type.Optional(Type.String({ description: "Search query for symbols/SSR pattern" })),
-	new_name: Type.Optional(Type.String({ description: "New name for rename action" })),
-	replacement: Type.Optional(Type.String({ description: "Replacement for SSR action" })),
-	kind: Type.Optional(Type.String({ description: "Code action kind filter (quickfix, refactor, source)" })),
-	apply: Type.Optional(Type.Boolean({ description: "Apply edits instead of preview (default: true)" })),
-	action_index: Type.Optional(Type.Number({ description: "Index of code action to apply" })),
-	include_declaration: Type.Optional(
-		Type.Boolean({ description: "Include declaration in references (default: true)" }),
+		{ description: "LSP operation" },
 	),
+	files: Type.Optional(Type.Array(Type.String({ description: "File path" }))),
+	file: Type.Optional(Type.String({ description: "File path" })),
+	line: Type.Optional(Type.Number({ description: "Line number (1-indexed)" })),
+	column: Type.Optional(Type.Number({ description: "Column number (1-indexed)" })),
+	end_line: Type.Optional(Type.Number({ description: "End line for range (1-indexed)" })),
+	end_character: Type.Optional(Type.Number({ description: "End column for range (1-indexed)" })),
+	query: Type.Optional(Type.String({ description: "Search query or SSR pattern" })),
+	new_name: Type.Optional(Type.String({ description: "New name for rename" })),
+	replacement: Type.Optional(Type.String({ description: "Replacement text for SSR" })),
+	kind: Type.Optional(Type.String({ description: "Action kind: quickfix, refactor, source" })),
+	apply: Type.Optional(Type.Boolean({ description: "Apply edits (default: true)" })),
+	action_index: Type.Optional(Type.Number({ description: "Index of action to apply" })),
+	include_declaration: Type.Optional(Type.Boolean({ description: "Include declaration in refs (default: true)" })),
 });
 
 export type LspParams = Static<typeof lspSchema>;

package/src/{core/tools/lsp → lsp}/utils.ts

@@ -1,5 +1,5 @@
 import path from "node:path";
-import { type Theme, theme } from "../../../modes/interactive/theme/theme";
+import { type Theme, theme } from "$c/modes/theme/theme";
 import type {
 	Diagnostic,
 	DiagnosticSeverity,

package/src/main.ts

@@ -11,6 +11,7 @@ import { createInterface } from "node:readline/promises";
 import { type ImageContent, supportsXhigh } from "@oh-my-pi/pi-ai";
 import { postmortem } from "@oh-my-pi/pi-utils";
 import chalk from "chalk";
+import { initTheme, stopThemeWatcher } from "$c/modes/theme/theme";
 import { type Args, parseArgs, printHelp } from "./cli/args";
 import { parseConfigArgs, printConfigHelp, runConfigCommand } from "./cli/config-cli";
 import { processFileArguments } from "./cli/file-processor";
@@ -21,21 +22,20 @@ import { parseSetupArgs, printSetupHelp, runSetupCommand } from "./cli/setup-cli
 import { parseStatsArgs, printStatsHelp, runStatsCommand } from "./cli/stats-cli";
 import { parseUpdateArgs, printUpdateHelp, runUpdateCommand } from "./cli/update-cli";
 import { findConfigFile, getModelsPath, VERSION } from "./config";
-import type { AgentSession } from "./core/agent-session";
-import { exportFromFile } from "./core/export-html/index";
-import type { ExtensionUIContext } from "./core/index";
-import type { ModelRegistry } from "./core/model-registry";
-import { parseModelPattern, parseModelString, resolveModelScope, type ScopedModel } from "./core/model-resolver";
-import { type CreateAgentSessionOptions, createAgentSession, discoverAuthStorage, discoverModels } from "./core/sdk";
-import { type SessionInfo, SessionManager } from "./core/session-manager";
-import { SettingsManager } from "./core/settings-manager";
-import { resolvePromptInput } from "./core/system-prompt";
-import { printTimings, time } from "./core/timings";
+import type { ModelRegistry } from "./config/model-registry";
+import { parseModelPattern, parseModelString, resolveModelScope, type ScopedModel } from "./config/model-resolver";
+import { SettingsManager } from "./config/settings-manager";
 import { initializeWithSettings } from "./discovery";
+import { exportFromFile } from "./export/html/index";
+import type { ExtensionUIContext } from "./extensibility/extensions/types";
 import { runMigrations, showDeprecationWarnings } from "./migrations";
 import { InteractiveMode, runPrintMode, runRpcMode } from "./modes/index";
-import { initTheme, stopThemeWatcher } from "./modes/interactive/theme/theme";
+import { type CreateAgentSessionOptions, createAgentSession, discoverAuthStorage, discoverModels } from "./sdk";
+import type { AgentSession } from "./session/agent-session";
+import { type SessionInfo, SessionManager } from "./session/session-manager";
+import { resolvePromptInput } from "./system-prompt";
 import { getChangelogPath, getNewEntries, parseChangelog } from "./utils/changelog";
+import { printTimings, time } from "./utils/timings";
 
 async function checkForNewVersion(currentVersion: string): Promise<string | undefined> {
 	try {
@@ -85,7 +85,7 @@ async function runInteractiveMode(
 	initialMessages: string[],
 	setExtensionUIContext: (uiContext: ExtensionUIContext, hasUI: boolean) => void,
 	lspServers: Array<{ name: string; status: "ready" | "error"; fileTypes: string[] }> | undefined,
-	mcpManager: import("./core/mcp/index").MCPManager | undefined,
+	mcpManager: import("./mcp/index").MCPManager | undefined,
 	initialMessage?: string,
 	initialImages?: ImageContent[],
 ): Promise<void> {

package/src/{core/mcp → mcp}/config.ts

@@ -4,9 +4,9 @@
  * Uses the capability system to load MCP servers from multiple sources.
  */
 
-import { mcpCapability } from "../../capability/mcp";
-import type { MCPServer } from "../../discovery";
-import { loadCapability } from "../../discovery";
+import { mcpCapability } from "$c/capability/mcp";
+import type { MCPServer } from "$c/discovery";
+import { loadCapability } from "$c/discovery";
 import type { MCPServerConfig } from "./types";
 
 /** Options for loading MCP configs */
@@ -24,7 +24,7 @@ export interface LoadMCPConfigsResult {
 	/** Extracted Exa API keys (if any were filtered) */
 	exaApiKeys: string[];
 	/** Source metadata for each server */
-	sources: Record<string, import("../../capability/types").SourceMeta>;
+	sources: Record<string, import("../capability/types").SourceMeta>;
 }
 
 /**
@@ -90,7 +90,7 @@ export async function loadAllMCPConfigs(cwd: string, options?: LoadMCPConfigsOpt
 
 	// Convert to legacy format and preserve source metadata
 	const configs: Record<string, MCPServerConfig> = {};
-	const sources: Record<string, import("../../capability/types").SourceMeta> = {};
+	const sources: Record<string, import("../capability/types").SourceMeta> = {};
 	for (const server of servers) {
 		configs[server.name] = convertToLegacyConfig(server);
 		sources[server.name] = server._source;
@@ -180,7 +180,7 @@ export interface ExaFilterResult {
 	/** Extracted Exa API keys (if any) */
 	exaApiKeys: string[];
 	/** Source metadata for remaining servers */
-	sources: Record<string, import("../../capability/types").SourceMeta>;
+	sources: Record<string, import("../capability/types").SourceMeta>;
 }
 
 /**
@@ -189,10 +189,10 @@ export interface ExaFilterResult {
  */
 export function filterExaMCPServers(
 	configs: Record<string, MCPServerConfig>,
-	sources: Record<string, import("../../capability/types").SourceMeta>,
+	sources: Record<string, import("../capability/types").SourceMeta>,
 ): ExaFilterResult {
 	const filtered: Record<string, MCPServerConfig> = {};
-	const filteredSources: Record<string, import("../../capability/types").SourceMeta> = {};
+	const filteredSources: Record<string, import("../capability/types").SourceMeta> = {};
 	const exaApiKeys: string[] = [];
 
 	for (const [name, config] of Object.entries(configs)) {

package/src/{core/mcp → mcp}/loader.ts

@@ -5,10 +5,9 @@
  */
 
 import { logger } from "@oh-my-pi/pi-utils";
-import { AgentStorage } from "../agent-storage";
-import type { LoadedCustomTool } from "../custom-tools/types";
+import type { LoadedCustomTool } from "$c/extensibility/custom-tools/types";
+import { AgentStorage } from "$c/session/agent-storage";
 import { type MCPLoadResult, MCPManager } from "./manager";
-import { parseMCPToolName } from "./tool-bridge";
 import { MCPToolCache } from "./tool-cache";
 
 /** Result from loading MCP tools */
@@ -80,9 +79,9 @@ export async function discoverAndLoadMCPTools(cwd: string, options?: MCPToolsLoa
 
 	// Convert MCP tools to LoadedCustomTool format
 	const loadedTools: LoadedCustomTool[] = result.tools.map((tool) => {
-		// Parse the MCP tool name to get server name
-		const parsed = parseMCPToolName(tool.name);
-		const serverName = parsed?.serverName;
+		// MCPTool and DeferredMCPTool have these properties
+		const mcpTool = tool as { mcpServerName?: string };
+		const serverName = mcpTool.mcpServerName;
 
 		// Get provider info from manager's connection if available
 		const connection = serverName ? manager.getConnection(serverName) : undefined;

package/src/{core/mcp → mcp}/manager.ts

@@ -7,7 +7,7 @@
 
 import { logger } from "@oh-my-pi/pi-utils";
 import type { TSchema } from "@sinclair/typebox";
-import type { CustomTool } from "../custom-tools/types";
+import type { CustomTool } from "$c/extensibility/custom-tools/types";
 import { connectToServer, disconnectServer, listTools } from "./client";
 import { loadAllMCPConfigs, validateServerConfig } from "./config";
 import type { MCPToolDetails } from "./tool-bridge";
@@ -15,7 +15,7 @@ import { DeferredMCPTool, MCPTool } from "./tool-bridge";
 import type { MCPToolCache } from "./tool-cache";
 import type { MCPServerConfig, MCPServerConnection, MCPToolDefinition } from "./types";
 
-type SourceMeta = import("../../capability/types").SourceMeta;
+type SourceMeta = import("../capability/types").SourceMeta;
 
 type ToolLoadResult = {
 	connection: MCPServerConnection;

package/src/{core/mcp → mcp}/tool-bridge.ts

@@ -6,8 +6,8 @@
 
 import type { AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import type { TSchema } from "@sinclair/typebox";
-import type { SourceMeta } from "../../capability/types";
-import type { CustomTool, CustomToolContext, CustomToolResult } from "../custom-tools/types";
+import type { SourceMeta } from "$c/capability/types";
+import type { CustomTool, CustomToolContext, CustomToolResult } from "$c/extensibility/custom-tools/types";
 import { callTool } from "./client";
 import type { MCPContent, MCPServerConnection, MCPToolDefinition } from "./types";
 
@@ -66,21 +66,38 @@ function formatMCPContent(content: MCPContent[]): string {
 
 /**
  * Create a unique tool name for an MCP tool.
- * Prefixes with server name to avoid conflicts.
+ *
+ * Prefixes with server name to avoid conflicts. If the tool name already
+ * starts with the server name (e.g., server "puppeteer" with tool
+ * "puppeteer_screenshot"), strips the redundant prefix to produce
+ * "mcp_puppeteer_screenshot" instead of "mcp_puppeteer_puppeteer_screenshot".
  */
 export function createMCPToolName(serverName: string, toolName: string): string {
-	// Use underscore separator since tool names can't have special chars
-	return `mcp_${serverName}_${toolName}`;
+	// Strip redundant server name prefix from tool name if present
+	const prefixWithUnderscore = `${serverName}_`;
+	const prefixWithHyphen = `${serverName}-`;
+
+	let normalizedToolName = toolName;
+	if (toolName.startsWith(prefixWithUnderscore)) {
+		normalizedToolName = toolName.slice(prefixWithUnderscore.length);
+	} else if (toolName.startsWith(prefixWithHyphen)) {
+		normalizedToolName = toolName.slice(prefixWithHyphen.length);
+	}
+
+	return `mcp_${serverName}_${normalizedToolName}`;
 }
 
 /**
  * Parse an MCP tool name back to server and tool components.
+ *
+ * Note: This returns the normalized tool name (with server prefix stripped).
+ * The original MCP tool name may have had the server name as a prefix.
  */
 export function parseMCPToolName(name: string): { serverName: string; toolName: string } | null {
 	if (!name.startsWith("mcp_")) return null;
 
 	const rest = name.slice(4);
-	const underscoreIdx = rest.lastIndexOf("_");
+	const underscoreIdx = rest.indexOf("_");
 	if (underscoreIdx === -1) return null;
 
 	return {
@@ -97,6 +114,10 @@ export class MCPTool implements CustomTool<TSchema, MCPToolDetails> {
 	public readonly label: string;
 	public readonly description: string;
 	public readonly parameters: TSchema;
+	/** Original MCP tool name (before normalization) */
+	public readonly mcpToolName: string;
+	/** Server name */
+	public readonly mcpServerName: string;
 
 	/** Create MCPTool instances for all tools from an MCP server connection */
 	static fromTools(connection: MCPServerConnection, tools: MCPToolDefinition[]): MCPTool[] {
@@ -111,6 +132,8 @@ export class MCPTool implements CustomTool<TSchema, MCPToolDetails> {
 		this.label = `${connection.name}/${tool.name}`;
 		this.description = tool.description ?? `MCP tool from ${connection.name}`;
 		this.parameters = convertSchema(tool.inputSchema);
+		this.mcpToolName = tool.name;
+		this.mcpServerName = connection.name;
 	}
 
 	async execute(
@@ -168,6 +191,10 @@ export class DeferredMCPTool implements CustomTool<TSchema, MCPToolDetails> {
 	public readonly label: string;
 	public readonly description: string;
 	public readonly parameters: TSchema;
+	/** Original MCP tool name (before normalization) */
+	public readonly mcpToolName: string;
+	/** Server name */
+	public readonly mcpServerName: string;
 	private readonly fallbackProvider: string | undefined;
 	private readonly fallbackProviderName: string | undefined;
 
@@ -191,6 +218,8 @@ export class DeferredMCPTool implements CustomTool<TSchema, MCPToolDetails> {
 		this.label = `${serverName}/${tool.name}`;
 		this.description = tool.description ?? `MCP tool from ${serverName}`;
 		this.parameters = convertSchema(tool.inputSchema);
+		this.mcpToolName = tool.name;
+		this.mcpServerName = serverName;
 		this.fallbackProvider = source?.provider;
 		this.fallbackProviderName = source?.providerName;
 	}

package/src/{core/mcp → mcp}/tool-cache.ts

@@ -5,7 +5,7 @@
  */
 
 import { logger } from "@oh-my-pi/pi-utils";
-import type { AgentStorage } from "../agent-storage";
+import type { AgentStorage } from "$c/session/agent-storage";
 import type { MCPServerConfig, MCPToolDefinition } from "./types";
 
 const CACHE_VERSION = 1;

package/src/{core/mcp → mcp}/transports/http.ts

@@ -5,7 +5,13 @@
  * Based on MCP spec 2025-03-26.
  */
 
-import type { JsonRpcMessage, JsonRpcResponse, MCPHttpServerConfig, MCPSseServerConfig, MCPTransport } from "../types";
+import type {
+	JsonRpcMessage,
+	JsonRpcResponse,
+	MCPHttpServerConfig,
+	MCPSseServerConfig,
+	MCPTransport,
+} from "$c/mcp/types";
 
 /** Generate unique request ID */
 function generateId(): string {

package/src/{core/mcp → mcp}/transports/stdio.ts

@@ -6,7 +6,7 @@
  */
 
 import { type Subprocess, spawn } from "bun";
-import type { JsonRpcResponse, MCPStdioServerConfig, MCPTransport } from "../types";
+import type { JsonRpcResponse, MCPStdioServerConfig, MCPTransport } from "$c/mcp/types";
 
 /** Generate unique request ID */
 function generateId(): string {

package/src/{core/mcp → mcp}/types.ts

@@ -218,7 +218,7 @@ export interface MCPServerConnection {
 	/** Cached tools (populated on demand) */
 	tools?: MCPToolDefinition[];
 	/** Source metadata (for display) */
-	_source?: import("../../capability/types").SourceMeta;
+	_source?: import("../capability/types").SourceMeta;
 }
 
 /** MCP tool with server context */

package/src/migrations.ts

@@ -6,9 +6,9 @@ import { existsSync, mkdirSync, readdirSync, readFileSync, renameSync, rmSync, w
 import { join } from "node:path";
 import { logger } from "@oh-my-pi/pi-utils";
 import chalk from "chalk";
+import { AgentStorage } from "$c/session/agent-storage";
+import type { AuthCredential } from "$c/session/auth-storage";
 import { getAgentDbPath, getAgentDir, getBinDir } from "./config";
-import { AgentStorage } from "./core/agent-storage";
-import type { AuthCredential } from "./core/auth-storage";
 
 /**
  * Migrate legacy oauth.json and settings.json apiKeys to agent.db.

package/src/modes/{interactive/components → components}/armin.ts

@@ -3,7 +3,7 @@
  */
 
 import type { Component, TUI } from "@oh-my-pi/pi-tui";
-import { theme } from "../theme/theme";
+import { theme } from "$c/modes/theme/theme";
 
 // XBM image: 31x36 pixels, LSB first, 1=background, 0=foreground
 const WIDTH = 31;

package/src/modes/{interactive/components → components}/assistant-message.ts

@@ -1,6 +1,6 @@
 import type { AssistantMessage } from "@oh-my-pi/pi-ai";
 import { Container, Markdown, Spacer, Text } from "@oh-my-pi/pi-tui";
-import { getMarkdownTheme, theme } from "../theme/theme";
+import { getMarkdownTheme, theme } from "$c/modes/theme/theme";
 
 /**
  * Component that renders a complete assistant message

package/src/modes/{interactive/components → components}/bash-execution.ts

@@ -4,13 +4,9 @@
 
 import { Container, Loader, Spacer, Text, type TUI } from "@oh-my-pi/pi-tui";
 import stripAnsi from "strip-ansi";
-import {
-	DEFAULT_MAX_BYTES,
-	DEFAULT_MAX_LINES,
-	type TruncationResult,
-	truncateTail,
-} from "../../../core/tools/truncate";
-import { getSymbolTheme, theme } from "../theme/theme";
+import { getSymbolTheme, theme } from "$c/modes/theme/theme";
+import type { TruncationMeta } from "$c/tools/output-meta";
+import { formatSize } from "$c/tools/truncate";
 import { DynamicBorder } from "./dynamic-border";
 import { truncateToVisualLines } from "./visual-truncate";
 
@@ -23,8 +19,7 @@ export class BashExecutionComponent extends Container {
 	private status: "running" | "complete" | "cancelled" | "error" = "running";
 	private exitCode: number | undefined = undefined;
 	private loader: Loader;
-	private truncationResult?: TruncationResult;
-	private fullOutputPath?: string;
+	private truncation?: TruncationMeta;
 	private expanded = false;
 	private contentContainer: Container;
 
@@ -78,9 +73,7 @@ export class BashExecutionComponent extends Container {
 	}
 
 	appendOutput(chunk: string): void {
-		// Strip ANSI codes and normalize line endings
-		// Note: binary data is already sanitized in tui-renderer.ts executeBashCommand
-		const clean = stripAnsi(chunk).replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+		const clean = this.normalizeOutput(chunk);
 
 		// Append to output lines
 		const newLines = clean.split("\n");
@@ -98,8 +91,7 @@ export class BashExecutionComponent extends Container {
 	setComplete(
 		exitCode: number | undefined,
 		cancelled: boolean,
-		truncationResult?: TruncationResult,
-		fullOutputPath?: string,
+		options?: { output?: string; truncation?: TruncationMeta },
 	): void {
 		this.exitCode = exitCode;
 		this.status = cancelled
@@ -107,8 +99,10 @@ export class BashExecutionComponent extends Container {
 			: exitCode !== 0 && exitCode !== undefined && exitCode !== null
 				? "error"
 				: "complete";
-		this.truncationResult = truncationResult;
-		this.fullOutputPath = fullOutputPath;
+		this.truncation = options?.truncation;
+		if (options?.output !== undefined) {
+			this.setOutput(options.output);
+		}
 
 		// Stop loader
 		this.loader.stop();
@@ -117,15 +111,7 @@ export class BashExecutionComponent extends Container {
 	}
 
 	private updateDisplay(): void {
-		// Apply truncation for LLM context limits (same limits as bash tool)
-		const fullOutput = this.outputLines.join("\n");
-		const contextTruncation = truncateTail(fullOutput, {
-			maxLines: DEFAULT_MAX_LINES,
-			maxBytes: DEFAULT_MAX_BYTES,
-		});
-
-		// Get the lines to potentially display (after context truncation)
-		const availableLines = contextTruncation.content ? contextTruncation.content.split("\n") : [];
+		const availableLines = this.outputLines;
 
 		// Apply preview truncation based on expanded state
 		const previewLogicalLines = availableLines.slice(-PREVIEW_LINES);
@@ -177,10 +163,21 @@ export class BashExecutionComponent extends Container {
 				statusParts.push(theme.fg("error", `(exit ${this.exitCode})`));
 			}
 
-			// Add truncation warning (context truncation, not preview truncation)
-			const wasTruncated = this.truncationResult?.truncated || contextTruncation.truncated;
-			if (wasTruncated && this.fullOutputPath) {
-				statusParts.push(theme.fg("warning", `Output truncated. Full output: ${this.fullOutputPath}`));
+			if (this.truncation) {
+				const warnings: string[] = [];
+				if (this.truncation.artifactId) {
+					warnings.push(`Full output: artifact://${this.truncation.artifactId}`);
+				}
+				if (this.truncation.truncatedBy === "lines") {
+					warnings.push(
+						`Truncated: showing ${this.truncation.outputLines} of ${this.truncation.totalLines} lines`,
+					);
+				} else {
+					warnings.push(
+						`Truncated: ${this.truncation.outputLines} lines shown (${formatSize(this.truncation.outputBytes)} limit)`,
+					);
+				}
+				statusParts.push(theme.fg("warning", warnings.join(". ")));
 			}
 
 			if (statusParts.length > 0) {
@@ -189,6 +186,17 @@ export class BashExecutionComponent extends Container {
 		}
 	}
 
+	private normalizeOutput(text: string): string {
+		// Strip ANSI codes and normalize line endings
+		// Note: binary data is already sanitized in tui-renderer.ts executeBashCommand
+		return stripAnsi(text).replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+	}
+
+	private setOutput(output: string): void {
+		const clean = this.normalizeOutput(output);
+		this.outputLines = clean ? clean.split("\n") : [];
+	}
+
 	/**
 	 * Get the raw output for creating BashExecutionMessage.
 	 */

package/src/modes/{interactive/components → components}/bordered-loader.ts

@@ -1,5 +1,5 @@
 import { CancellableLoader, Container, Spacer, Text, type TUI } from "@oh-my-pi/pi-tui";
-import type { Theme } from "../theme/theme";
+import type { Theme } from "$c/modes/theme/theme";
 import { DynamicBorder } from "./dynamic-border";
 
 /** Loader wrapped with borders for hook UI */