@oh-my-pi/pi-coding-agent 8.0.2 → 8.0.4

package/src/modes/components/python-execution.ts

@@ -3,11 +3,11 @@
  * Shares the same kernel session as the agent's Python tool.
  */
 
+import { getSymbolTheme, highlightCode, theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
+import type { TruncationMeta } from "@oh-my-pi/pi-coding-agent/tools/output-meta";
+import { formatSize } from "@oh-my-pi/pi-coding-agent/tools/truncate";
 import { Container, Loader, Spacer, Text, type TUI } from "@oh-my-pi/pi-tui";
 import stripAnsi from "strip-ansi";
-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";
 

package/src/modes/components/queue-mode-selector.ts

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

package/src/modes/components/read-tool-group.ts

@@ -1,7 +1,7 @@
+import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
+import { shortenPath } from "@oh-my-pi/pi-coding-agent/tools/render-utils";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Container, Text } from "@oh-my-pi/pi-tui";
-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/components/session-selector.ts

@@ -1,3 +1,6 @@
+import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
+import type { SessionInfo } from "@oh-my-pi/pi-coding-agent/session/session-manager";
+import { fuzzyFilter } from "@oh-my-pi/pi-coding-agent/utils/fuzzy";
 import {
 	type Component,
 	Container,
@@ -8,9 +11,6 @@ import {
 	truncateToWidth,
 	visibleWidth,
 } from "@oh-my-pi/pi-tui";
-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/components/settings-defs.ts

@@ -9,7 +9,6 @@
  */
 
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
-import { getCapabilities } from "@oh-my-pi/pi-tui";
 import type {
 	ImageProviderOption,
 	NotificationMethod,
@@ -20,7 +19,8 @@ import type {
 	StatusLineSeparatorStyle,
 	SymbolPreset,
 	WebSearchProviderOption,
-} from "$c/config/settings-manager";
+} from "@oh-my-pi/pi-coding-agent/config/settings-manager";
+import { getCapabilities } from "@oh-my-pi/pi-tui";
 import { getPreset } from "./status-line/presets";
 
 // Setting value types

package/src/modes/components/settings-selector.ts

@@ -1,4 +1,6 @@
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
+import type { SettingsManager, StatusLineSettings } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
+import { getSelectListTheme, getSettingsListTheme, theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import {
 	Container,
 	matchesKey,
@@ -12,8 +14,6 @@ import {
 	type TabBarTheme,
 	Text,
 } from "@oh-my-pi/pi-tui";
-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/components/show-images-selector.ts

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

package/src/modes/components/status-line/segments.ts

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

package/src/modes/components/status-line/separators.ts

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

package/src/modes/components/status-line/types.ts

@@ -4,8 +4,8 @@ import type {
 	StatusLineSegmentOptions,
 	StatusLineSeparatorStyle,
 	StatusLineSettings,
-} from "$c/config/settings-manager";
-import type { AgentSession } from "$c/session/agent-session";
+} from "@oh-my-pi/pi-coding-agent/config/settings-manager";
+import type { AgentSession } from "@oh-my-pi/pi-coding-agent/session/agent-session";
 
 // Re-export types from settings-manager (single source of truth)
 export type {

package/src/modes/components/status-line-segment-editor.ts

@@ -9,9 +9,9 @@
  * - Live preview shown in the actual status line above
  */
 
+import type { StatusLineSegmentId } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
+import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import { Container, matchesKey } from "@oh-my-pi/pi-tui";
-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/components/status-line.ts

@@ -1,11 +1,11 @@
 import type { AssistantMessage } from "@oh-my-pi/pi-ai";
+import type { StatusLineSegmentOptions, StatusLineSettings } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
+import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
+import type { AgentSession } from "@oh-my-pi/pi-coding-agent/session/agent-session";
 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 { 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/components/theme-selector.ts

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

package/src/modes/components/thinking-selector.ts

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

package/src/modes/components/todo-display.ts

@@ -1,8 +1,8 @@
 import * as path from "node:path";
+import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
+import type { TodoItem } from "@oh-my-pi/pi-coding-agent/modes/types";
 import { Text } from "@oh-my-pi/pi-tui";
 import { logger } from "@oh-my-pi/pi-utils";
-import { theme } from "$c/modes/theme/theme";
-import type { TodoItem } from "$c/modes/types";
 
 const TODO_FILE_NAME = "todos.json";
 

package/src/modes/components/todo-reminder.ts

@@ -1,6 +1,6 @@
+import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
+import type { TodoItem } from "@oh-my-pi/pi-coding-agent/tools/todo-write";
 import { Box, Container, Spacer, Text } from "@oh-my-pi/pi-tui";
-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/components/tool-execution.ts

@@ -1,4 +1,15 @@
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
+import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
+import {
+	computeEditDiff,
+	computePatchDiff,
+	type EditDiffError,
+	type EditDiffResult,
+} from "@oh-my-pi/pi-coding-agent/patch";
+import { BASH_DEFAULT_PREVIEW_LINES } from "@oh-my-pi/pi-coding-agent/tools/bash";
+import { PYTHON_DEFAULT_PREVIEW_LINES } from "@oh-my-pi/pi-coding-agent/tools/python";
+import { toolRenderers } from "@oh-my-pi/pi-coding-agent/tools/renderers";
+import { convertToPng } from "@oh-my-pi/pi-coding-agent/utils/image-convert";
 import {
 	Box,
 	Container,
@@ -11,12 +22,6 @@ import {
 	type TUI,
 } from "@oh-my-pi/pi-tui";
 import { sanitizeText } from "@oh-my-pi/pi-utils";
-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

package/src/modes/components/tree-selector.ts

@@ -1,3 +1,6 @@
+import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
+import type { SessionTreeNode } from "@oh-my-pi/pi-coding-agent/session/session-manager";
+import { shortenPath } from "@oh-my-pi/pi-coding-agent/tools/render-utils";
 import {
 	type Component,
 	Container,
@@ -8,9 +11,6 @@ import {
 	TruncatedText,
 	truncateToWidth,
 } from "@oh-my-pi/pi-tui";
-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 │ */

package/src/modes/components/ttsr-notification.ts

@@ -1,6 +1,6 @@
+import type { Rule } from "@oh-my-pi/pi-coding-agent/capability/rule";
+import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import { Box, Container, Spacer, Text } from "@oh-my-pi/pi-tui";
-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/components/user-message-selector.ts

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

package/src/modes/components/user-message.ts

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

package/src/modes/components/welcome.ts

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

package/src/modes/controllers/command-controller.ts

@@ -2,24 +2,24 @@ import { mkdir, rm } from "node:fs/promises";
 import * as os from "node:os";
 import * as path from "node:path";
 import type { UsageLimit, UsageReport } from "@oh-my-pi/pi-ai";
+import { getDebugLogPath } from "@oh-my-pi/pi-coding-agent/config";
+import { loadCustomShare } from "@oh-my-pi/pi-coding-agent/export/custom-share";
+import type { CompactOptions } from "@oh-my-pi/pi-coding-agent/extensibility/extensions/types";
+import { getGatewayStatus } from "@oh-my-pi/pi-coding-agent/ipy/gateway-coordinator";
+import { ArminComponent } from "@oh-my-pi/pi-coding-agent/modes/components/armin";
+import { BashExecutionComponent } from "@oh-my-pi/pi-coding-agent/modes/components/bash-execution";
+import { BorderedLoader } from "@oh-my-pi/pi-coding-agent/modes/components/bordered-loader";
+import { DynamicBorder } from "@oh-my-pi/pi-coding-agent/modes/components/dynamic-border";
+import { PythonExecutionComponent } from "@oh-my-pi/pi-coding-agent/modes/components/python-execution";
+import { getMarkdownTheme, getSymbolTheme, theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
+import type { InteractiveModeContext } from "@oh-my-pi/pi-coding-agent/modes/types";
+import { createCompactionSummaryMessage } from "@oh-my-pi/pi-coding-agent/session/messages";
+import { outputMeta } from "@oh-my-pi/pi-coding-agent/tools/output-meta";
+import { getChangelogPath, parseChangelog } from "@oh-my-pi/pi-coding-agent/utils/changelog";
+import { copyToClipboard } from "@oh-my-pi/pi-coding-agent/utils/clipboard";
 import { Loader, Markdown, Spacer, Text, visibleWidth } from "@oh-my-pi/pi-tui";
 import { $ } from "bun";
 import { nanoid } from "nanoid";
-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) {}

package/src/modes/controllers/event-controller.ts

@@ -1,13 +1,17 @@
+import { AssistantMessageComponent } from "@oh-my-pi/pi-coding-agent/modes/components/assistant-message";
+import { ReadToolGroupComponent } from "@oh-my-pi/pi-coding-agent/modes/components/read-tool-group";
+import { TodoReminderComponent } from "@oh-my-pi/pi-coding-agent/modes/components/todo-reminder";
+import { ToolExecutionComponent } from "@oh-my-pi/pi-coding-agent/modes/components/tool-execution";
+import { TtsrNotificationComponent } from "@oh-my-pi/pi-coding-agent/modes/components/ttsr-notification";
+import { getSymbolTheme, theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
+import type { InteractiveModeContext, TodoItem } from "@oh-my-pi/pi-coding-agent/modes/types";
+import type { AgentSessionEvent } from "@oh-my-pi/pi-coding-agent/session/agent-session";
+import {
+	detectNotificationProtocol,
+	isNotificationSuppressed,
+	sendNotification,
+} from "@oh-my-pi/pi-coding-agent/utils/terminal-notify";
 import { Loader, Text } from "@oh-my-pi/pi-tui";
-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/controllers/extension-ui-controller.ts

@@ -1,20 +1,26 @@
-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 { KeybindingsManager } from "@oh-my-pi/pi-coding-agent/config/keybindings";
 import type {
 	ExtensionActions,
 	ExtensionCommandContextActions,
 	ExtensionContextActions,
 	ExtensionError,
 	ExtensionUIContext,
-} 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";
+} from "@oh-my-pi/pi-coding-agent/extensibility/extensions/index";
+import { HookEditorComponent } from "@oh-my-pi/pi-coding-agent/modes/components/hook-editor";
+import { HookInputComponent } from "@oh-my-pi/pi-coding-agent/modes/components/hook-input";
+import { HookSelectorComponent } from "@oh-my-pi/pi-coding-agent/modes/components/hook-selector";
+import {
+	getAvailableThemesWithPaths,
+	getThemeByName,
+	setTheme,
+	type Theme,
+	theme,
+} from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
+import type { InteractiveModeContext } from "@oh-my-pi/pi-coding-agent/modes/types";
+import { setTerminalTitle } from "@oh-my-pi/pi-coding-agent/utils/title-generator";
+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";
 
 export class ExtensionUiController {
 	constructor(private ctx: InteractiveModeContext) {}

package/src/modes/controllers/input-controller.ts

@@ -4,13 +4,13 @@ import { open, rm } from "node:fs/promises";
 import * as os from "node:os";
 import * as path from "node:path";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
+import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
+import type { InteractiveModeContext } from "@oh-my-pi/pi-coding-agent/modes/types";
+import type { AgentSessionEvent } from "@oh-my-pi/pi-coding-agent/session/agent-session";
+import { readImageFromClipboard } from "@oh-my-pi/pi-coding-agent/utils/clipboard";
+import { resizeImage } from "@oh-my-pi/pi-coding-agent/utils/image-resize";
+import { generateSessionTitle, setTerminalTitle } from "@oh-my-pi/pi-coding-agent/utils/title-generator";
 import { nanoid } from "nanoid";
-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/controllers/selector-controller.ts

@@ -1,23 +1,29 @@
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { OAuthProvider } from "@oh-my-pi/pi-ai";
+import { getAgentDbPath } from "@oh-my-pi/pi-coding-agent/config";
+import { disableProvider, enableProvider } from "@oh-my-pi/pi-coding-agent/discovery";
+import { AssistantMessageComponent } from "@oh-my-pi/pi-coding-agent/modes/components/assistant-message";
+import { ExtensionDashboard } from "@oh-my-pi/pi-coding-agent/modes/components/extensions";
+import { HistorySearchComponent } from "@oh-my-pi/pi-coding-agent/modes/components/history-search";
+import { ModelSelectorComponent } from "@oh-my-pi/pi-coding-agent/modes/components/model-selector";
+import { OAuthSelectorComponent } from "@oh-my-pi/pi-coding-agent/modes/components/oauth-selector";
+import { SessionSelectorComponent } from "@oh-my-pi/pi-coding-agent/modes/components/session-selector";
+import { SettingsSelectorComponent } from "@oh-my-pi/pi-coding-agent/modes/components/settings-selector";
+import { ToolExecutionComponent } from "@oh-my-pi/pi-coding-agent/modes/components/tool-execution";
+import { TreeSelectorComponent } from "@oh-my-pi/pi-coding-agent/modes/components/tree-selector";
+import { UserMessageSelectorComponent } from "@oh-my-pi/pi-coding-agent/modes/components/user-message-selector";
+import {
+	getAvailableThemes,
+	getSymbolTheme,
+	setSymbolPreset,
+	setTheme,
+	theme,
+} from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
+import type { InteractiveModeContext } from "@oh-my-pi/pi-coding-agent/modes/types";
+import { SessionManager } from "@oh-my-pi/pi-coding-agent/session/session-manager";
+import { setPreferredImageProvider, setPreferredWebSearchProvider } from "@oh-my-pi/pi-coding-agent/tools/index";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Input, Loader, Spacer, Text } from "@oh-my-pi/pi-tui";
-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/interactive-mode.ts

@@ -6,6 +6,16 @@
 import * as path from "node:path";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { AssistantMessage, ImageContent, Message, UsageReport } from "@oh-my-pi/pi-ai";
+import { KeybindingsManager } from "@oh-my-pi/pi-coding-agent/config/keybindings";
+import type { SettingsManager } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
+import type { ExtensionUIContext } from "@oh-my-pi/pi-coding-agent/extensibility/extensions/index";
+import type { CompactOptions } from "@oh-my-pi/pi-coding-agent/extensibility/extensions/types";
+import { loadSlashCommands } from "@oh-my-pi/pi-coding-agent/extensibility/slash-commands";
+import type { AgentSession, AgentSessionEvent } from "@oh-my-pi/pi-coding-agent/session/agent-session";
+import { HistoryStorage } from "@oh-my-pi/pi-coding-agent/session/history-storage";
+import type { SessionContext, SessionManager } from "@oh-my-pi/pi-coding-agent/session/session-manager";
+import { getRecentSessions } from "@oh-my-pi/pi-coding-agent/session/session-manager";
+import { setTerminalTitle } from "@oh-my-pi/pi-coding-agent/utils/title-generator";
 import type { Component, Loader, SlashCommand } from "@oh-my-pi/pi-tui";
 import {
 	CombinedAutocompleteProvider,
@@ -18,16 +28,6 @@ import {
 } from "@oh-my-pi/pi-tui";
 import { logger, postmortem } from "@oh-my-pi/pi-utils";
 import chalk from "chalk";
-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("$c/mcp/index").MCPManager;
+	public mcpManager?: import("@oh-my-pi/pi-coding-agent/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("$c/mcp/index").MCPManager,
+		mcpManager?: import("@oh-my-pi/pi-coding-agent/mcp/index").MCPManager,
 	) {
 		this.session = session;
 		this.sessionManager = session.sessionManager;

package/src/modes/print-mode.ts

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

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

@@ -6,10 +6,10 @@
 
 import type { AgentEvent, AgentMessage, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent } from "@oh-my-pi/pi-ai";
+import type { BashResult } from "@oh-my-pi/pi-coding-agent/exec/bash-executor";
+import type { SessionStats } from "@oh-my-pi/pi-coding-agent/session/agent-session";
+import type { CompactionResult } from "@oh-my-pi/pi-coding-agent/session/compaction/index";
 import { createSanitizerStream, createSplitterStream, createTextDecoderStream, ptree } from "@oh-my-pi/pi-utils";
-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

@@ -11,11 +11,14 @@
  * - Extension UI: Extension UI requests are emitted, client responds with extension_ui_response
  */
 
+import type {
+	ExtensionUIContext,
+	ExtensionUIDialogOptions,
+} from "@oh-my-pi/pi-coding-agent/extensibility/extensions/index";
+import { type Theme, theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
+import type { AgentSession } from "@oh-my-pi/pi-coding-agent/session/agent-session";
 import { readLines } from "@oh-my-pi/pi-utils";
 import { nanoid } from "nanoid";
-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 { BashResult } from "$c/exec/bash-executor";
-import type { SessionStats } from "$c/session/agent-session";
-import type { CompactionResult } from "$c/session/compaction/index";
+import type { BashResult } from "@oh-my-pi/pi-coding-agent/exec/bash-executor";
+import type { SessionStats } from "@oh-my-pi/pi-coding-agent/session/agent-session";
+import type { CompactionResult } from "@oh-my-pi/pi-coding-agent/session/compaction/index";
 
 // ============================================================================
 // RPC Commands (stdin)

package/src/modes/theme/theme.ts

@@ -1,12 +1,12 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
+import { getCustomThemesDir } from "@oh-my-pi/pi-coding-agent/config";
 import type { EditorTheme, MarkdownTheme, SelectListTheme, SymbolTheme } from "@oh-my-pi/pi-tui";
 import { logger } from "@oh-my-pi/pi-utils";
 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 "$c/config";
 // Embed theme JSON files at build time
 import darkThemeJson from "./dark.json" with { type: "json" };
 import { defaultThemes } from "./defaults";

package/src/modes/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 { KeybindingsManager } from "@oh-my-pi/pi-coding-agent/config/keybindings";
+import type { SettingsManager } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
+import type { ExtensionUIContext } from "@oh-my-pi/pi-coding-agent/extensibility/extensions/index";
+import type { CompactOptions } from "@oh-my-pi/pi-coding-agent/extensibility/extensions/types";
+import type { MCPManager } from "@oh-my-pi/pi-coding-agent/mcp/index";
+import type { AgentSession, AgentSessionEvent } from "@oh-my-pi/pi-coding-agent/session/agent-session";
+import type { HistoryStorage } from "@oh-my-pi/pi-coding-agent/session/history-storage";
+import type { SessionContext, SessionManager } from "@oh-my-pi/pi-coding-agent/session/session-manager";
 import type { Component, Container, Loader, Spacer, Text, TUI } from "@oh-my-pi/pi-tui";
-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";