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

package/src/modes/{interactive/components → components}/ttsr-notification.ts

@@ -1,6 +1,6 @@
 import { Box, Container, Spacer, Text } from "@oh-my-pi/pi-tui";
-import type { Rule } from "../../../capability/rule";
-import { theme } from "../theme/theme";
+import type { Rule } from "$c/capability/rule";
+import { theme } from "$c/modes/theme/theme";
 
 /**
  * Component that renders a TTSR (Time Traveling Stream Rules) notification.

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

@@ -1,5 +1,5 @@
 import { type Component, Container, matchesKey, Spacer, Text, truncateToWidth } from "@oh-my-pi/pi-tui";
-import { theme } from "../theme/theme";
+import { theme } from "$c/modes/theme/theme";
 import { DynamicBorder } from "./dynamic-border";
 
 interface UserMessageItem {

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

@@ -1,5 +1,5 @@
 import { Container, Markdown, Spacer } from "@oh-my-pi/pi-tui";
-import { getMarkdownTheme, theme } from "../theme/theme";
+import { getMarkdownTheme, theme } from "$c/modes/theme/theme";
 
 /**
  * Component that renders a user message

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

@@ -1,6 +1,6 @@
 import { type Component, truncateToWidth, visibleWidth } from "@oh-my-pi/pi-tui";
-import { APP_NAME } from "../../../config";
-import { theme } from "../theme/theme";
+import { APP_NAME } from "$c/config";
+import { theme } from "$c/modes/theme/theme";
 
 export interface RecentSession {
 	name: string;

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

@@ -5,21 +5,21 @@ import type { UsageLimit, UsageReport } from "@oh-my-pi/pi-ai";
 import { Loader, Markdown, Spacer, Text, visibleWidth } from "@oh-my-pi/pi-tui";
 import { $ } from "bun";
 import { nanoid } from "nanoid";
-import { getDebugLogPath } from "../../../config";
-import { loadCustomShare } from "../../../core/custom-share";
-import type { CompactOptions } from "../../../core/extensions/types";
-import { createCompactionSummaryMessage } from "../../../core/messages";
-import { getGatewayStatus } from "../../../core/python-gateway-coordinator";
-import type { TruncationResult } from "../../../core/tools/truncate";
-import { getChangelogPath, parseChangelog } from "../../../utils/changelog";
-import { copyToClipboard } from "../../../utils/clipboard";
-import { ArminComponent } from "../components/armin";
-import { BashExecutionComponent } from "../components/bash-execution";
-import { BorderedLoader } from "../components/bordered-loader";
-import { DynamicBorder } from "../components/dynamic-border";
-import { PythonExecutionComponent } from "../components/python-execution";
-import { getMarkdownTheme, getSymbolTheme, theme } from "../theme/theme";
-import type { InteractiveModeContext } from "../types";
+import { getDebugLogPath } from "$c/config";
+import { loadCustomShare } from "$c/export/custom-share";
+import type { CompactOptions } from "$c/extensibility/extensions/types";
+import { getGatewayStatus } from "$c/ipy/gateway-coordinator";
+import { ArminComponent } from "$c/modes/components/armin";
+import { BashExecutionComponent } from "$c/modes/components/bash-execution";
+import { BorderedLoader } from "$c/modes/components/bordered-loader";
+import { DynamicBorder } from "$c/modes/components/dynamic-border";
+import { PythonExecutionComponent } from "$c/modes/components/python-execution";
+import { getMarkdownTheme, getSymbolTheme, theme } from "$c/modes/theme/theme";
+import type { InteractiveModeContext } from "$c/modes/types";
+import { createCompactionSummaryMessage } from "$c/session/messages";
+import { outputMeta } from "$c/tools/output-meta";
+import { getChangelogPath, parseChangelog } from "$c/utils/changelog";
+import { copyToClipboard } from "$c/utils/clipboard";
 
 export class CommandController {
 	constructor(private readonly ctx: InteractiveModeContext) {}
@@ -243,11 +243,15 @@ export class CommandController {
 		const gateway = getGatewayStatus();
 		info += `\n${theme.bold("Python Gateway")}\n`;
 		if (gateway.active) {
-			const mode = gateway.shared ? "Shared" : "Local";
-			info += `${theme.fg("dim", "Status:")} ${theme.fg("success", `Active (${mode})`)}\n`;
+			info += `${theme.fg("dim", "Status:")} ${theme.fg("success", "Active (Global)")}\n`;
 			info += `${theme.fg("dim", "URL:")} ${gateway.url}\n`;
 			info += `${theme.fg("dim", "PID:")} ${gateway.pid}\n`;
-			info += `${theme.fg("dim", "Clients:")} ${gateway.refCount}\n`;
+			if (gateway.pythonPath) {
+				info += `${theme.fg("dim", "Python:")} ${gateway.pythonPath}\n`;
+			}
+			if (gateway.venvPath) {
+				info += `${theme.fg("dim", "Venv:")} ${gateway.venvPath}\n`;
+			}
 			if (gateway.uptime !== null) {
 				const uptimeSec = Math.floor(gateway.uptime / 1000);
 				const mins = Math.floor(uptimeSec / 60);
@@ -484,12 +488,11 @@ export class CommandController {
 			);
 
 			if (this.ctx.bashComponent) {
-				this.ctx.bashComponent.setComplete(
-					result.exitCode,
-					result.cancelled,
-					result.truncated ? ({ truncated: true, content: result.output } as TruncationResult) : undefined,
-					result.fullOutputPath,
-				);
+				const meta = outputMeta().truncationFromSummary(result, { direction: "tail" }).get();
+				this.ctx.bashComponent.setComplete(result.exitCode, result.cancelled, {
+					output: result.output,
+					truncation: meta?.truncation,
+				});
 			}
 		} catch (error) {
 			if (this.ctx.bashComponent) {
@@ -527,12 +530,11 @@ export class CommandController {
 			);
 
 			if (this.ctx.pythonComponent) {
-				this.ctx.pythonComponent.setComplete(
-					result.exitCode,
-					result.cancelled,
-					result.truncated ? ({ truncated: true, content: result.output } as TruncationResult) : undefined,
-					result.fullOutputPath,
-				);
+				const meta = outputMeta().truncationFromSummary(result, { direction: "tail" }).get();
+				this.ctx.pythonComponent.setComplete(result.exitCode, result.cancelled, {
+					output: result.output,
+					truncation: meta?.truncation,
+				});
 			}
 		} catch (error) {
 			if (this.ctx.pythonComponent) {

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

@@ -1,13 +1,13 @@
 import { Loader, Text } from "@oh-my-pi/pi-tui";
-import type { AgentSessionEvent } from "../../../core/agent-session";
-import { detectNotificationProtocol, isNotificationSuppressed, sendNotification } from "../../../core/terminal-notify";
-import { AssistantMessageComponent } from "../components/assistant-message";
-import { ReadToolGroupComponent } from "../components/read-tool-group";
-import { TodoReminderComponent } from "../components/todo-reminder";
-import { ToolExecutionComponent } from "../components/tool-execution";
-import { TtsrNotificationComponent } from "../components/ttsr-notification";
-import { getSymbolTheme, theme } from "../theme/theme";
-import type { InteractiveModeContext, TodoItem } from "../types";
+import { AssistantMessageComponent } from "$c/modes/components/assistant-message";
+import { ReadToolGroupComponent } from "$c/modes/components/read-tool-group";
+import { TodoReminderComponent } from "$c/modes/components/todo-reminder";
+import { ToolExecutionComponent } from "$c/modes/components/tool-execution";
+import { TtsrNotificationComponent } from "$c/modes/components/ttsr-notification";
+import { getSymbolTheme, theme } from "$c/modes/theme/theme";
+import type { InteractiveModeContext, TodoItem } from "$c/modes/types";
+import type { AgentSessionEvent } from "$c/session/agent-session";
+import { detectNotificationProtocol, isNotificationSuppressed, sendNotification } from "$c/utils/terminal-notify";
 
 export class EventController {
 	private lastReadGroup: ReadToolGroupComponent | undefined = undefined;

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

@@ -1,20 +1,20 @@
 import type { Component, TUI } from "@oh-my-pi/pi-tui";
 import { Spacer, Text } from "@oh-my-pi/pi-tui";
 import { logger } from "@oh-my-pi/pi-utils";
+import { KeybindingsManager } from "$c/config/keybindings";
 import type {
 	ExtensionActions,
 	ExtensionCommandContextActions,
 	ExtensionContextActions,
 	ExtensionError,
 	ExtensionUIContext,
-} from "../../../core/extensions/index";
-import { KeybindingsManager } from "../../../core/keybindings";
-import { setTerminalTitle } from "../../../core/title-generator";
-import { HookEditorComponent } from "../components/hook-editor";
-import { HookInputComponent } from "../components/hook-input";
-import { HookSelectorComponent } from "../components/hook-selector";
-import { getAvailableThemesWithPaths, getThemeByName, setTheme, type Theme, theme } from "../theme/theme";
-import type { InteractiveModeContext } from "../types";
+} from "$c/extensibility/extensions/index";
+import { HookEditorComponent } from "$c/modes/components/hook-editor";
+import { HookInputComponent } from "$c/modes/components/hook-input";
+import { HookSelectorComponent } from "$c/modes/components/hook-selector";
+import { getAvailableThemesWithPaths, getThemeByName, setTheme, type Theme, theme } from "$c/modes/theme/theme";
+import type { InteractiveModeContext } from "$c/modes/types";
+import { setTerminalTitle } from "$c/utils/title-generator";
 
 export class ExtensionUiController {
 	constructor(private ctx: InteractiveModeContext) {}

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

@@ -5,12 +5,12 @@ import * as os from "node:os";
 import * as path from "node:path";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import { nanoid } from "nanoid";
-import type { AgentSessionEvent } from "../../../core/agent-session";
-import { generateSessionTitle, setTerminalTitle } from "../../../core/title-generator";
-import { readImageFromClipboard } from "../../../utils/clipboard";
-import { resizeImage } from "../../../utils/image-resize";
-import { theme } from "../theme/theme";
-import type { InteractiveModeContext } from "../types";
+import { theme } from "$c/modes/theme/theme";
+import type { InteractiveModeContext } from "$c/modes/types";
+import type { AgentSessionEvent } from "$c/session/agent-session";
+import { readImageFromClipboard } from "$c/utils/clipboard";
+import { resizeImage } from "$c/utils/image-resize";
+import { generateSessionTitle, setTerminalTitle } from "$c/utils/title-generator";
 
 interface Expandable {
 	setExpanded(expanded: boolean): void;

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}

@@ -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;
@@ -396,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)}`);
@@ -499,7 +499,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		}
 
 		this.stop();
-		process.exit(0);
+		await postmortem.quit(0);
 	}
 
 	async checkShutdownRequested(): Promise<void> {

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, 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";
 };
 

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";