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

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

@@ -1,6 +1,6 @@
 import { Box, Markdown, Spacer, Text } from "@oh-my-pi/pi-tui";
-import type { BranchSummaryMessage } from "../../../core/messages";
-import { getMarkdownTheme, theme } from "../theme/theme";
+import { getMarkdownTheme, theme } from "$c/modes/theme/theme";
+import type { BranchSummaryMessage } from "$c/session/messages";
 
 /**
  * Component that renders a branch summary message with collapsed/expanded state.

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

@@ -1,6 +1,6 @@
 import { Box, Markdown, Spacer, Text } from "@oh-my-pi/pi-tui";
-import type { CompactionSummaryMessage } from "../../../core/messages";
-import { getMarkdownTheme, theme } from "../theme/theme";
+import { getMarkdownTheme, theme } from "$c/modes/theme/theme";
+import type { CompactionSummaryMessage } from "$c/session/messages";
 
 /**
  * Component that renders a compaction message with collapsed/expanded state.

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

@@ -1,9 +1,9 @@
 import type { TextContent } from "@oh-my-pi/pi-ai";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Box, Container, Markdown, Spacer, Text } from "@oh-my-pi/pi-tui";
-import type { MessageRenderer } from "../../../core/extensions/types";
-import type { CustomMessage } from "../../../core/messages";
-import { getMarkdownTheme, theme } from "../theme/theme";
+import type { MessageRenderer } from "$c/extensibility/extensions/types";
+import { getMarkdownTheme, theme } from "$c/modes/theme/theme";
+import type { CustomMessage } from "$c/session/messages";
 
 /**
  * Component that renders a custom message entry from extensions.

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

@@ -1,5 +1,5 @@
 import * as Diff from "diff";
-import { theme } from "../theme/theme";
+import { theme } from "$c/modes/theme/theme";
 
 /**
  * Parse diff line to extract prefix, line number, and content.

package/src/modes/{interactive/components → components}/dynamic-border.ts

@@ -1,5 +1,5 @@
 import type { Component } from "@oh-my-pi/pi-tui";
-import { theme } from "../theme/theme";
+import { theme } from "$c/modes/theme/theme";
 
 /**
  * Dynamic border component that adjusts to viewport width.

package/src/modes/{interactive/components → components}/extensions/extension-dashboard.ts

@@ -13,9 +13,9 @@
  */
 
 import { type Component, Container, matchesKey, Spacer, Text, truncateToWidth, visibleWidth } from "@oh-my-pi/pi-tui";
-import type { SettingsManager } from "../../../../core/settings-manager";
-import { theme } from "../../theme/theme";
-import { DynamicBorder } from "../dynamic-border";
+import type { SettingsManager } from "$c/config/settings-manager";
+import { DynamicBorder } from "$c/modes/components/dynamic-border";
+import { theme } from "$c/modes/theme/theme";
 import { ExtensionList } from "./extension-list";
 import { InspectorPanel } from "./inspector-panel";
 import { applyFilter, createInitialState, filterByProvider, refreshState, toggleProvider } from "./state-manager";

package/src/modes/{interactive/components → components}/extensions/extension-list.ts

@@ -7,8 +7,8 @@
  */
 
 import { type Component, matchesKey, truncateToWidth, visibleWidth } from "@oh-my-pi/pi-tui";
-import { isProviderEnabled } from "../../../../discovery";
-import { theme } from "../../theme/theme";
+import { isProviderEnabled } from "$c/discovery";
+import { theme } from "$c/modes/theme/theme";
 import { applyFilter } from "./state-manager";
 import type { Extension, ExtensionKind, ExtensionState } from "./types";
 

package/src/modes/{interactive/components → components}/extensions/inspector-panel.ts

@@ -6,7 +6,7 @@
 
 import { homedir } from "node:os";
 import { type Component, truncateToWidth, wrapTextWithAnsi } from "@oh-my-pi/pi-tui";
-import { theme } from "../../theme/theme";
+import { theme } from "$c/modes/theme/theme";
 import type { Extension, ExtensionState } from "./types";
 
 export class InspectorPanel implements Component {

package/src/modes/{interactive/components → components}/extensions/state-manager.ts

@@ -4,23 +4,17 @@
  */
 
 import { logger } from "@oh-my-pi/pi-utils";
-import type { ContextFile } from "../../../../capability/context-file";
-import type { ExtensionModule } from "../../../../capability/extension-module";
-import type { Hook } from "../../../../capability/hook";
-import type { MCPServer } from "../../../../capability/mcp";
-import type { Prompt } from "../../../../capability/prompt";
-import type { Rule } from "../../../../capability/rule";
-import type { Skill } from "../../../../capability/skill";
-import type { SlashCommand } from "../../../../capability/slash-command";
-import type { CustomTool } from "../../../../capability/tool";
-import type { SourceMeta } from "../../../../capability/types";
-import {
-	disableProvider,
-	enableProvider,
-	getAllProvidersInfo,
-	isProviderEnabled,
-	loadCapability,
-} from "../../../../discovery";
+import type { ContextFile } from "$c/capability/context-file";
+import type { ExtensionModule } from "$c/capability/extension-module";
+import type { Hook } from "$c/capability/hook";
+import type { MCPServer } from "$c/capability/mcp";
+import type { Prompt } from "$c/capability/prompt";
+import type { Rule } from "$c/capability/rule";
+import type { Skill } from "$c/capability/skill";
+import type { SlashCommand } from "$c/capability/slash-command";
+import type { CustomTool } from "$c/capability/tool";
+import type { SourceMeta } from "$c/capability/types";
+import { disableProvider, enableProvider, getAllProvidersInfo, isProviderEnabled, loadCapability } from "$c/discovery";
 import type {
 	DashboardState,
 	Extension,

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

@@ -2,7 +2,7 @@
  * Types for the Extension Control Center dashboard.
  */
 
-import type { SourceMeta } from "../../../../capability/types";
+import type { SourceMeta } from "$c/capability/types";
 
 /**
  * Extension kinds matching capability types.

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

@@ -2,9 +2,9 @@ import { existsSync, type FSWatcher, readFileSync, watch } from "node:fs";
 import type { AssistantMessage } from "@oh-my-pi/pi-ai";
 import { type Component, truncateToWidth, visibleWidth } from "@oh-my-pi/pi-tui";
 import { dirname, join } from "path";
-import type { AgentSession } from "../../../core/agent-session";
-import { shortenPath } from "../../../core/tools/render-utils";
-import { theme } from "../theme/theme";
+import { theme } from "$c/modes/theme/theme";
+import type { AgentSession } from "$c/session/agent-session";
+import { shortenPath } from "$c/tools/render-utils";
 
 /**
  * Sanitize text for display in a single-line status.

package/src/modes/{interactive/components → components}/history-search.ts

@@ -8,8 +8,8 @@ import {
 	truncateToWidth,
 	visibleWidth,
 } from "@oh-my-pi/pi-tui";
-import type { HistoryEntry, HistoryStorage } from "../../../core/history-storage";
-import { theme } from "../theme/theme";
+import { theme } from "$c/modes/theme/theme";
+import type { HistoryEntry, HistoryStorage } from "$c/session/history-storage";
 import { DynamicBorder } from "./dynamic-border";
 
 class HistoryResultsList implements Component {

package/src/modes/{interactive/components → components}/hook-editor.ts

@@ -8,7 +8,7 @@ import * as os from "node:os";
 import * as path from "node:path";
 import { Container, Editor, matchesKey, Spacer, Text, type TUI } from "@oh-my-pi/pi-tui";
 import { nanoid } from "nanoid";
-import { getEditorTheme, theme } from "../theme/theme";
+import { getEditorTheme, theme } from "$c/modes/theme/theme";
 import { DynamicBorder } from "./dynamic-border";
 
 export class HookEditorComponent extends Container {

package/src/modes/{interactive/components → components}/hook-input.ts

@@ -3,7 +3,7 @@
  */
 
 import { Container, Input, matchesKey, Spacer, Text, type TUI } from "@oh-my-pi/pi-tui";
-import { theme } from "../theme/theme";
+import { theme } from "$c/modes/theme/theme";
 import { CountdownTimer } from "./countdown-timer";
 import { DynamicBorder } from "./dynamic-border";
 

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

@@ -1,9 +1,9 @@
 import type { TextContent } from "@oh-my-pi/pi-ai";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Box, Container, Markdown, Spacer, Text } from "@oh-my-pi/pi-tui";
-import type { HookMessageRenderer } from "../../../core/hooks/types";
-import type { HookMessage } from "../../../core/messages";
-import { getMarkdownTheme, theme } from "../theme/theme";
+import type { HookMessageRenderer } from "$c/extensibility/hooks/types";
+import { getMarkdownTheme, theme } from "$c/modes/theme/theme";
+import type { HookMessage } from "$c/session/messages";
 
 /**
  * Component that renders a custom message entry from hooks.

package/src/modes/{interactive/components → components}/hook-selector.ts

@@ -4,7 +4,7 @@
  */
 
 import { Container, matchesKey, Spacer, Text, type TUI } from "@oh-my-pi/pi-tui";
-import { theme } from "../theme/theme";
+import { theme } from "$c/modes/theme/theme";
 import { CountdownTimer } from "./countdown-timer";
 import { DynamicBorder } from "./dynamic-border";
 

package/src/modes/{interactive/components → components}/keybinding-hints.ts

@@ -3,8 +3,8 @@
  */
 
 import { type EditorAction, getEditorKeybindings, type KeyId } from "@oh-my-pi/pi-tui";
-import type { AppAction, KeybindingsManager } from "../../../core/keybindings";
-import { theme } from "../theme/theme";
+import type { AppAction, KeybindingsManager } from "$c/config/keybindings";
+import { theme } from "$c/modes/theme/theme";
 
 /**
  * Format keys array as display string (e.g., ["ctrl+c", "escape"] -> "ctrl+c/escape").

package/src/modes/{interactive/components → components}/login-dialog.ts

@@ -1,7 +1,7 @@
 import { getOAuthProviders } from "@oh-my-pi/pi-ai";
 import { Container, getEditorKeybindings, Input, Spacer, Text, type TUI } from "@oh-my-pi/pi-tui";
 import { $ } from "bun";
-import { theme } from "../theme/theme";
+import { theme } from "$c/modes/theme/theme";
 import { DynamicBorder } from "./dynamic-border";
 
 /**

package/src/modes/{interactive/components → components}/model-selector.ts

@@ -11,11 +11,11 @@ import {
 	type TUI,
 	visibleWidth,
 } from "@oh-my-pi/pi-tui";
-import type { ModelRegistry } from "../../../core/model-registry";
-import { parseModelString } from "../../../core/model-resolver";
-import type { SettingsManager } from "../../../core/settings-manager";
-import { fuzzyFilter } from "../../../utils/fuzzy";
-import { type ThemeColor, theme } from "../theme/theme";
+import type { ModelRegistry } from "$c/config/model-registry";
+import { parseModelString } from "$c/config/model-resolver";
+import type { SettingsManager } from "$c/config/settings-manager";
+import { type ThemeColor, theme } from "$c/modes/theme/theme";
+import { fuzzyFilter } from "$c/utils/fuzzy";
 import { DynamicBorder } from "./dynamic-border";
 
 function makeInvertedBadge(label: string, color: ThemeColor): string {

package/src/modes/{interactive/components → components}/oauth-selector.ts

@@ -1,7 +1,7 @@
 import { getOAuthProviders, type OAuthProviderInfo } from "@oh-my-pi/pi-ai";
 import { Container, matchesKey, Spacer, TruncatedText } from "@oh-my-pi/pi-tui";
-import type { AuthStorage } from "../../../core/auth-storage";
-import { theme } from "../theme/theme";
+import { theme } from "$c/modes/theme/theme";
+import type { AuthStorage } from "$c/session/auth-storage";
 import { DynamicBorder } from "./dynamic-border";
 
 /**

package/src/modes/{interactive/components → components}/plugin-settings.ts

@@ -18,9 +18,9 @@ import {
 	Spacer,
 	Text,
 } from "@oh-my-pi/pi-tui";
-import { PluginManager } from "../../../core/plugins/manager";
-import type { InstalledPlugin, PluginSettingSchema } from "../../../core/plugins/types";
-import { getSelectListTheme, getSettingsListTheme, theme } from "../theme/theme";
+import { PluginManager } from "$c/extensibility/plugins/manager";
+import type { InstalledPlugin, PluginSettingSchema } from "$c/extensibility/plugins/types";
+import { getSelectListTheme, getSettingsListTheme, theme } from "$c/modes/theme/theme";
 import { DynamicBorder } from "./dynamic-border";
 
 // =============================================================================

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

@@ -5,13 +5,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, highlightCode, theme } from "../theme/theme";
+import { getSymbolTheme, highlightCode, 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 PythonExecutionComponent 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;
 	private excludeFromContext: boolean;
@@ -77,7 +72,7 @@ export class PythonExecutionComponent extends Container {
 	}
 
 	appendOutput(chunk: string): void {
-		const clean = stripAnsi(chunk).replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+		const clean = this.normalizeOutput(chunk);
 
 		const newLines = clean.split("\n");
 		if (this.outputLines.length > 0 && newLines.length > 0) {
@@ -93,8 +88,7 @@ export class PythonExecutionComponent extends Container {
 	setComplete(
 		exitCode: number | undefined,
 		cancelled: boolean,
-		truncationResult?: TruncationResult,
-		fullOutputPath?: string,
+		options?: { output?: string; truncation?: TruncationMeta },
 	): void {
 		this.exitCode = exitCode;
 		this.status = cancelled
@@ -102,21 +96,17 @@ export class PythonExecutionComponent 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);
+		}
 
 		this.loader.stop();
 		this.updateDisplay();
 	}
 
 	private updateDisplay(): void {
-		const fullOutput = this.outputLines.join("\n");
-		const contextTruncation = truncateTail(fullOutput, {
-			maxLines: DEFAULT_MAX_LINES,
-			maxBytes: DEFAULT_MAX_BYTES,
-		});
-
-		const availableLines = contextTruncation.content ? contextTruncation.content.split("\n") : [];
+		const availableLines = this.outputLines;
 		const previewLogicalLines = availableLines.slice(-PREVIEW_LINES);
 		const hiddenLineCount = availableLines.length - previewLogicalLines.length;
 
@@ -159,9 +149,21 @@ export class PythonExecutionComponent extends Container {
 				statusParts.push(theme.fg("error", `(exit ${this.exitCode})`));
 			}
 
-			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) {
@@ -170,6 +172,15 @@ export class PythonExecutionComponent extends Container {
 		}
 	}
 
+	private normalizeOutput(text: string): string {
+		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") : [];
+	}
+
 	getOutput(): string {
 		return this.outputLines.join("\n");
 	}

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

@@ -1,5 +1,5 @@
 import { Container, type SelectItem, SelectList } from "@oh-my-pi/pi-tui";
-import { getSelectListTheme } from "../theme/theme";
+import { getSelectListTheme } from "$c/modes/theme/theme";
 import { DynamicBorder } from "./dynamic-border";
 
 /**

package/src/modes/{interactive/components → components}/read-tool-group.ts

@@ -1,7 +1,7 @@
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Container, Text } from "@oh-my-pi/pi-tui";
-import { shortenPath } from "../../../core/tools/render-utils";
-import { theme } from "../theme/theme";
+import { theme } from "$c/modes/theme/theme";
+import { shortenPath } from "$c/tools/render-utils";
 import type { ToolExecutionHandle } from "./tool-execution";
 
 type ReadRenderArgs = {

package/src/modes/{interactive/components → components}/session-selector.ts

@@ -8,9 +8,9 @@ import {
 	truncateToWidth,
 	visibleWidth,
 } from "@oh-my-pi/pi-tui";
-import type { SessionInfo } from "../../../core/session-manager";
-import { fuzzyFilter } from "../../../utils/fuzzy";
-import { theme } from "../theme/theme";
+import { theme } from "$c/modes/theme/theme";
+import type { SessionInfo } from "$c/session/session-manager";
+import { fuzzyFilter } from "$c/utils/fuzzy";
 import { DynamicBorder } from "./dynamic-border";
 
 /**

package/src/modes/{interactive/components → components}/settings-defs.ts

@@ -20,7 +20,7 @@ import type {
 	StatusLineSeparatorStyle,
 	SymbolPreset,
 	WebSearchProviderOption,
-} from "../../../core/settings-manager";
+} from "$c/config/settings-manager";
 import { getPreset } from "./status-line/presets";
 
 // Setting value types
@@ -307,7 +307,7 @@ export const SETTINGS_DEFS: SettingDef[] = [
 		tab: "tools",
 		type: "boolean",
 		label: "Edit patch mode",
-		description: "Use codex-style apply-patch format instead of oldText/newText for edits",
+		description: "Use codex-style apply-patch format instead of old_text/new_text for edits",
 		get: (sm) => sm.getEditPatchMode(),
 		set: (sm, v) => sm.setEditPatchMode(v),
 	},

package/src/modes/{interactive/components → components}/settings-selector.ts

@@ -12,8 +12,8 @@ import {
 	type TabBarTheme,
 	Text,
 } from "@oh-my-pi/pi-tui";
-import type { SettingsManager, StatusLineSettings } from "../../../core/settings-manager";
-import { getSelectListTheme, getSettingsListTheme, theme } from "../theme/theme";
+import type { SettingsManager, StatusLineSettings } from "$c/config/settings-manager";
+import { getSelectListTheme, getSettingsListTheme, theme } from "$c/modes/theme/theme";
 import { DynamicBorder } from "./dynamic-border";
 import { PluginSettingsComponent } from "./plugin-settings";
 import { getSettingsForTab, type SettingDef } from "./settings-defs";

package/src/modes/{interactive/components → components}/show-images-selector.ts

@@ -1,5 +1,5 @@
 import { Container, type SelectItem, SelectList } from "@oh-my-pi/pi-tui";
-import { getSelectListTheme } from "../theme/theme";
+import { getSelectListTheme } from "$c/modes/theme/theme";
 import { DynamicBorder } from "./dynamic-border";
 
 /**

package/src/modes/{interactive/components → components}/status-line/segments.ts

@@ -1,6 +1,6 @@
 import { hostname as osHostname } from "node:os";
-import { shortenPath } from "../../../../core/tools/render-utils";
-import { theme } from "../../theme/theme";
+import { theme } from "$c/modes/theme/theme";
+import { shortenPath } from "$c/tools/render-utils";
 import type { RenderedSegment, SegmentContext, StatusLineSegment, StatusLineSegmentId } from "./types";
 
 export type { SegmentContext } from "./types";

package/src/modes/{interactive/components → components}/status-line/separators.ts

@@ -1,4 +1,4 @@
-import type { Theme } from "../../theme/theme";
+import type { Theme } from "$c/modes/theme/theme";
 import type { SeparatorDef, StatusLineSeparatorStyle } from "./types";
 
 function trimSep(value: string): string {

package/src/modes/{interactive/components → components}/status-line/types.ts

@@ -1,11 +1,11 @@
-import type { AgentSession } from "../../../../core/agent-session";
 import type {
 	StatusLinePreset,
 	StatusLineSegmentId,
 	StatusLineSegmentOptions,
 	StatusLineSeparatorStyle,
 	StatusLineSettings,
-} from "../../../../core/settings-manager";
+} from "$c/config/settings-manager";
+import type { AgentSession } from "$c/session/agent-session";
 
 // Re-export types from settings-manager (single source of truth)
 export type {

package/src/modes/{interactive/components → components}/status-line-segment-editor.ts

@@ -10,8 +10,8 @@
  */
 
 import { Container, matchesKey } from "@oh-my-pi/pi-tui";
-import type { StatusLineSegmentId } from "../../../core/settings-manager";
-import { theme } from "../theme/theme";
+import type { StatusLineSegmentId } from "$c/config/settings-manager";
+import { theme } from "$c/modes/theme/theme";
 import { ALL_SEGMENT_IDS } from "./status-line/segments";
 
 // Segment display names and short descriptions

package/src/modes/{interactive/components → components}/status-line.ts

@@ -3,9 +3,9 @@ import { type Component, truncateToWidth, visibleWidth } from "@oh-my-pi/pi-tui"
 import { $ } from "bun";
 import { type FSWatcher, watch } from "fs";
 import { dirname, join } from "path";
-import type { AgentSession } from "../../../core/agent-session";
-import type { StatusLineSegmentOptions, StatusLineSettings } from "../../../core/settings-manager";
-import { theme } from "../theme/theme";
+import type { StatusLineSegmentOptions, StatusLineSettings } from "$c/config/settings-manager";
+import { theme } from "$c/modes/theme/theme";
+import type { AgentSession } from "$c/session/agent-session";
 import { getPreset } from "./status-line/presets";
 import { renderSegment, type SegmentContext } from "./status-line/segments";
 import { getSeparator } from "./status-line/separators";

package/src/modes/{interactive/components → components}/theme-selector.ts

@@ -1,5 +1,5 @@
 import { Container, type SelectItem, SelectList } from "@oh-my-pi/pi-tui";
-import { getAvailableThemes, getSelectListTheme } from "../theme/theme";
+import { getAvailableThemes, getSelectListTheme } from "$c/modes/theme/theme";
 import { DynamicBorder } from "./dynamic-border";
 
 /**

package/src/modes/{interactive/components → components}/thinking-selector.ts

@@ -1,6 +1,6 @@
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import { Container, type SelectItem, SelectList } from "@oh-my-pi/pi-tui";
-import { getSelectListTheme } from "../theme/theme";
+import { getSelectListTheme } from "$c/modes/theme/theme";
 import { DynamicBorder } from "./dynamic-border";
 
 const LEVEL_DESCRIPTIONS: Record<ThinkingLevel, string> = {

package/src/modes/{interactive/components → components}/todo-display.ts

@@ -1,8 +1,8 @@
 import * as path from "node:path";
 import { Text } from "@oh-my-pi/pi-tui";
 import { logger } from "@oh-my-pi/pi-utils";
-import { theme } from "../theme/theme";
-import type { TodoItem } from "../types";
+import { theme } from "$c/modes/theme/theme";
+import type { TodoItem } from "$c/modes/types";
 
 const TODO_FILE_NAME = "todos.json";
 
@@ -80,8 +80,7 @@ export class TodoDisplayComponent {
 				text = theme.fg("success", `${prefix}${checkbox} ${theme.strikethrough(todo.content)}`);
 			} else if (todo.status === "in_progress") {
 				checkbox = theme.checkbox.unchecked;
-				const displayText = todo.activeForm !== todo.content ? todo.activeForm : todo.content;
-				text = theme.fg("accent", `${prefix}${checkbox} ${displayText}`);
+				text = theme.fg("accent", `${prefix}${checkbox} ${todo.content}`);
 			} else {
 				checkbox = theme.checkbox.unchecked;
 				text = theme.fg("dim", `${prefix}${checkbox} ${todo.content}`);

package/src/modes/{interactive/components → components}/todo-reminder.ts

@@ -1,6 +1,6 @@
 import { Box, Container, Spacer, Text } from "@oh-my-pi/pi-tui";
-import type { TodoItem } from "../../../core/tools/todo-write";
-import { theme } from "../theme/theme";
+import { theme } from "$c/modes/theme/theme";
+import type { TodoItem } from "$c/tools/todo-write";
 
 /**
  * Component that renders a todo completion reminder notification.

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

@@ -11,12 +11,12 @@ import {
 	type TUI,
 } from "@oh-my-pi/pi-tui";
 import { sanitizeText } from "@oh-my-pi/pi-utils";
-import { BASH_DEFAULT_PREVIEW_LINES } from "../../../core/tools/bash";
-import { computeEditDiff, computePatchDiff, type EditDiffError, type EditDiffResult } from "../../../core/tools/patch";
-import { PYTHON_DEFAULT_PREVIEW_LINES } from "../../../core/tools/python";
-import { toolRenderers } from "../../../core/tools/renderers";
-import { convertToPng } from "../../../utils/image-convert";
-import { theme } from "../theme/theme";
+import { theme } from "$c/modes/theme/theme";
+import { computeEditDiff, computePatchDiff, type EditDiffError, type EditDiffResult } from "$c/patch";
+import { BASH_DEFAULT_PREVIEW_LINES } from "$c/tools/bash";
+import { PYTHON_DEFAULT_PREVIEW_LINES } from "$c/tools/python";
+import { toolRenderers } from "$c/tools/renderers";
+import { convertToPng } from "$c/utils/image-convert";
 import { renderDiff } from "./diff";
 
 // Preview line limit for bash when not expanded
@@ -223,8 +223,8 @@ export class ToolExecutionComponent extends Container {
 			return;
 		}
 
-		const oldText = this.args?.oldText;
-		const newText = this.args?.newText;
+		const oldText = this.args?.old_text;
+		const newText = this.args?.new_text;
 		const all = this.args?.all;
 
 		// Need all three params to compute diff

package/src/modes/{interactive/components → components}/tree-selector.ts

@@ -8,9 +8,9 @@ import {
 	TruncatedText,
 	truncateToWidth,
 } from "@oh-my-pi/pi-tui";
-import type { SessionTreeNode } from "../../../core/session-manager";
-import { shortenPath } from "../../../core/tools/render-utils";
-import { theme } from "../theme/theme";
+import { theme } from "$c/modes/theme/theme";
+import type { SessionTreeNode } from "$c/session/session-manager";
+import { shortenPath } from "$c/tools/render-utils";
 import { DynamicBorder } from "./dynamic-border";
 
 /** Gutter info: position (displayIndent where connector was) and whether to show │ */