@oh-my-pi/pi-coding-agent 11.8.2 → 11.9.0

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

@@ -7,8 +7,8 @@ import { theme } from "../../modes/theme/theme";
  * Shows when a rule violation is detected and the stream is being rewound.
  */
 export class TtsrNotificationComponent extends Container {
-	private box: Box;
-	private _expanded = false;
+	#box: Box;
+	#expanded = false;
 
 	constructor(private readonly rules: Rule[]) {
 		super();
@@ -16,25 +16,25 @@ export class TtsrNotificationComponent extends Container {
 		this.addChild(new Spacer(1));
 
 		// Use inverse warning color for yellow background effect
-		this.box = new Box(1, 1, t => theme.inverse(theme.fg("warning", t)));
-		this.addChild(this.box);
+		this.#box = new Box(1, 1, t => theme.inverse(theme.fg("warning", t)));
+		this.addChild(this.#box);
 
-		this.rebuild();
+		this.#rebuild();
 	}
 
 	setExpanded(expanded: boolean): void {
-		if (this._expanded !== expanded) {
-			this._expanded = expanded;
-			this.rebuild();
+		if (this.#expanded !== expanded) {
+			this.#expanded = expanded;
+			this.#rebuild();
 		}
 	}
 
 	isExpanded(): boolean {
-		return this._expanded;
+		return this.#expanded;
 	}
 
-	private rebuild(): void {
-		this.box.clear();
+	#rebuild(): void {
+		this.#box.clear();
 
 		// Build header: warning symbol + rule name + rewind icon
 		const ruleNames = this.rules.map(r => theme.bold(r.name)).join(", ");
@@ -44,16 +44,16 @@ export class TtsrNotificationComponent extends Container {
 		// Create header with rewind icon on the right
 		const rewindIcon = theme.icon.rewind;
 
-		this.box.addChild(new Text(`${header}  ${rewindIcon}`, 0, 0));
+		this.#box.addChild(new Text(`${header}  ${rewindIcon}`, 0, 0));
 
 		// Show description(s) - italic and truncated
 		for (const rule of this.rules) {
 			const desc = rule.description || rule.content;
 			if (desc) {
-				this.box.addChild(new Spacer(1));
+				this.#box.addChild(new Spacer(1));
 
 				let displayText = desc.trim();
-				if (!this._expanded) {
+				if (!this.#expanded) {
 					// Truncate to first 2 lines
 					const lines = displayText.split("\n");
 					if (lines.length > 2) {
@@ -62,18 +62,18 @@ export class TtsrNotificationComponent extends Container {
 				}
 
 				// Use italic for subtle distinction (fg colors conflict with inverse)
-				this.box.addChild(new Text(theme.italic(displayText), 0, 0));
+				this.#box.addChild(new Text(theme.italic(displayText), 0, 0));
 			}
 		}
 
 		// Show expand hint if collapsed and there's more content
-		if (!this._expanded) {
+		if (!this.#expanded) {
 			const hasMoreContent = this.rules.some(r => {
 				const desc = r.description || r.content;
 				return desc && desc.split("\n").length > 2;
 			});
 			if (hasMoreContent) {
-				this.box.addChild(new Text(theme.italic(" (ctrl+o to expand)"), 0, 0));
+				this.#box.addChild(new Text(theme.italic(" (ctrl+o to expand)"), 0, 0));
 			}
 		}
 	}

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

@@ -12,15 +12,15 @@ interface UserMessageItem {
  * Custom user message list component with selection
  */
 class UserMessageList implements Component {
-	private selectedIndex: number = 0;
-	public onSelect?: (entryId: string) => void;
-	public onCancel?: () => void;
-	private maxVisible: number = 10; // Max messages visible
+	#selectedIndex: number = 0;
+	onSelect?: (entryId: string) => void;
+	onCancel?: () => void;
+	#maxVisible: number = 10; // Max messages visible
 
 	constructor(private readonly messages: UserMessageItem[]) {
 		// Store messages in chronological order (oldest to newest)
 		// Start with the last (most recent) message selected
-		this.selectedIndex = Math.max(0, this.messages.length - 1);
+		this.#selectedIndex = Math.max(0, this.messages.length - 1);
 	}
 
 	invalidate(): void {
@@ -38,14 +38,14 @@ class UserMessageList implements Component {
 		// Calculate visible range with scrolling
 		const startIndex = Math.max(
 			0,
-			Math.min(this.selectedIndex - Math.floor(this.maxVisible / 2), this.messages.length - this.maxVisible),
+			Math.min(this.#selectedIndex - Math.floor(this.#maxVisible / 2), this.messages.length - this.#maxVisible),
 		);
-		const endIndex = Math.min(startIndex + this.maxVisible, this.messages.length);
+		const endIndex = Math.min(startIndex + this.#maxVisible, this.messages.length);
 
 		// Render visible messages (2 lines per message + blank line)
 		for (let i = startIndex; i < endIndex; i++) {
 			const message = this.messages[i];
-			const isSelected = i === this.selectedIndex;
+			const isSelected = i === this.#selectedIndex;
 
 			// Normalize message to single line
 			const normalizedMessage = message.text.replace(/\n/g, " ").trim();
@@ -68,7 +68,7 @@ class UserMessageList implements Component {
 
 		// Add scroll indicator if needed
 		if (startIndex > 0 || endIndex < this.messages.length) {
-			const scrollInfo = theme.fg("muted", `  (${this.selectedIndex + 1}/${this.messages.length})`);
+			const scrollInfo = theme.fg("muted", `  (${this.#selectedIndex + 1}/${this.messages.length})`);
 			lines.push(scrollInfo);
 		}
 
@@ -78,15 +78,15 @@ class UserMessageList implements Component {
 	handleInput(keyData: string): void {
 		// Up arrow - go to previous (older) message, wrap to bottom when at top
 		if (matchesKey(keyData, "up")) {
-			this.selectedIndex = this.selectedIndex === 0 ? this.messages.length - 1 : this.selectedIndex - 1;
+			this.#selectedIndex = this.#selectedIndex === 0 ? this.messages.length - 1 : this.#selectedIndex - 1;
 		}
 		// Down arrow - go to next (newer) message, wrap to top when at bottom
 		else if (matchesKey(keyData, "down")) {
-			this.selectedIndex = this.selectedIndex === this.messages.length - 1 ? 0 : this.selectedIndex + 1;
+			this.#selectedIndex = this.#selectedIndex === this.messages.length - 1 ? 0 : this.#selectedIndex + 1;
 		}
 		// Enter - select message and branch
 		else if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
-			const selected = this.messages[this.selectedIndex];
+			const selected = this.messages[this.#selectedIndex];
 			if (selected && this.onSelect) {
 				this.onSelect(selected.id);
 			}
@@ -110,7 +110,7 @@ class UserMessageList implements Component {
  * Component that renders a user message selector for branching
  */
 export class UserMessageSelectorComponent extends Container {
-	private messageList: UserMessageList;
+	#messageList: UserMessageList;
 
 	constructor(messages: UserMessageItem[], onSelect: (entryId: string) => void, onCancel: () => void) {
 		super();
@@ -124,11 +124,11 @@ export class UserMessageSelectorComponent extends Container {
 		this.addChild(new Spacer(1));
 
 		// Create message list
-		this.messageList = new UserMessageList(messages);
-		this.messageList.onSelect = onSelect;
-		this.messageList.onCancel = onCancel;
+		this.#messageList = new UserMessageList(messages);
+		this.#messageList.onSelect = onSelect;
+		this.#messageList.onCancel = onCancel;
 
-		this.addChild(this.messageList);
+		this.addChild(this.#messageList);
 
 		// Add bottom border
 		this.addChild(new Spacer(1));
@@ -141,6 +141,6 @@ export class UserMessageSelectorComponent extends Container {
 	}
 
 	getMessageList(): UserMessageList {
-		return this.messageList;
+		return this.#messageList;
 	}
 }

package/src/modes/components/welcome.ts

@@ -53,17 +53,17 @@ export class WelcomeComponent implements Component {
 		const piLogo = ["▀████████████▀", " ╘███    ███  ", "  ███    ███  ", "  ███    ███  ", " ▄███▄  ▄███▄ "];
 
 		// Apply gradient to logo
-		const logoColored = piLogo.map(line => this.gradientLine(line));
+		const logoColored = piLogo.map(line => this.#gradientLine(line));
 
 		// Left column - centered content
 		const leftLines = [
 			"",
-			this.centerText(theme.bold("Welcome back!"), leftCol),
+			this.#centerText(theme.bold("Welcome back!"), leftCol),
 			"",
-			...logoColored.map(l => this.centerText(l, leftCol)),
+			...logoColored.map(l => this.#centerText(l, leftCol)),
 			"",
-			this.centerText(theme.fg("muted", this.modelName), leftCol),
-			this.centerText(theme.fg("borderMuted", this.providerName), leftCol),
+			this.#centerText(theme.fg("muted", this.modelName), leftCol),
+			this.#centerText(theme.fg("borderMuted", this.providerName), leftCol),
 		];
 
 		// Right column separator
@@ -138,8 +138,8 @@ export class WelcomeComponent implements Component {
 		// Content rows
 		const maxRows = Math.max(leftLines.length, rightLines.length);
 		for (let i = 0; i < maxRows; i++) {
-			const left = this.fitToWidth(leftLines[i] ?? "", leftCol);
-			const right = this.fitToWidth(rightLines[i] ?? "", rightCol);
+			const left = this.#fitToWidth(leftLines[i] ?? "", leftCol);
+			const right = this.#fitToWidth(rightLines[i] ?? "", rightCol);
 			lines.push(v + left + v + right + v);
 		}
 
@@ -150,7 +150,7 @@ export class WelcomeComponent implements Component {
 	}
 
 	/** Center text within a given width */
-	private centerText(text: string, width: number): string {
+	#centerText(text: string, width: number): string {
 		const visLen = visibleWidth(text);
 		if (visLen >= width) {
 			return truncateToWidth(text, width);
@@ -161,7 +161,7 @@ export class WelcomeComponent implements Component {
 	}
 
 	/** Apply magenta→cyan gradient to a string */
-	private gradientLine(line: string): string {
+	#gradientLine(line: string): string {
 		const colors = [
 			"\x1b[38;5;199m", // bright magenta
 			"\x1b[38;5;171m", // magenta-purple
@@ -191,7 +191,7 @@ export class WelcomeComponent implements Component {
 	}
 
 	/** Fit string to exact width with ANSI-aware truncation/padding */
-	private fitToWidth(str: string, width: number): string {
+	#fitToWidth(str: string, width: number): string {
 		const visLen = visibleWidth(str);
 		if (visLen > width) {
 			const ellipsis = "…";

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

@@ -9,7 +9,6 @@ import { $ } from "bun";
 import { loadCustomShare } from "../../export/custom-share";
 import type { CompactOptions } from "../../extensibility/extensions/types";
 import { getGatewayStatus } from "../../ipy/gateway-coordinator";
-import { ArminComponent } from "../../modes/components/armin";
 import { BashExecutionComponent } from "../../modes/components/bash-execution";
 import { BorderedLoader } from "../../modes/components/bordered-loader";
 import { DynamicBorder } from "../../modes/components/dynamic-border";
@@ -448,12 +447,6 @@ export class CommandController {
 		this.ctx.ui.requestRender();
 	}
 
-	handleArminSaysHi(): void {
-		this.ctx.chatContainer.addChild(new Spacer(1));
-		this.ctx.chatContainer.addChild(new ArminComponent(this.ctx.ui));
-		this.ctx.ui.requestRender();
-	}
-
 	async handleBashCommand(command: string, excludeFromContext = false): Promise<void> {
 		const isDeferred = this.ctx.session.isStreaming;
 		this.ctx.bashComponent = new BashExecutionComponent(command, this.ctx.ui, excludeFromContext);

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

@@ -11,25 +11,25 @@ import type { AgentSessionEvent } from "../../session/agent-session";
 import type { ExitPlanModeDetails } from "../../tools";
 
 export class EventController {
-	private lastReadGroup: ReadToolGroupComponent | undefined = undefined;
-	private lastThinkingCount = 0;
-	private renderedCustomMessages = new Set<string>();
+	#lastReadGroup: ReadToolGroupComponent | undefined = undefined;
+	#lastThinkingCount = 0;
+	#renderedCustomMessages = new Set<string>();
 
 	constructor(private ctx: InteractiveModeContext) {}
 
-	private resetReadGroup(): void {
-		this.lastReadGroup = undefined;
+	#resetReadGroup(): void {
+		this.#lastReadGroup = undefined;
 	}
 
-	private getReadGroup(): ReadToolGroupComponent {
-		if (!this.lastReadGroup) {
+	#getReadGroup(): ReadToolGroupComponent {
+		if (!this.#lastReadGroup) {
 			this.ctx.chatContainer.addChild(new Text("", 0, 0));
 			const group = new ReadToolGroupComponent();
 			group.setExpanded(this.ctx.toolOutputExpanded);
 			this.ctx.chatContainer.addChild(group);
-			this.lastReadGroup = group;
+			this.#lastReadGroup = group;
 		}
-		return this.lastReadGroup;
+		return this.#lastReadGroup;
 	}
 
 	subscribeToAgent(): void {
@@ -76,15 +76,15 @@ export class EventController {
 			case "message_start":
 				if (event.message.role === "hookMessage" || event.message.role === "custom") {
 					const signature = `${event.message.role}:${event.message.customType}:${event.message.timestamp}`;
-					if (this.renderedCustomMessages.has(signature)) {
+					if (this.#renderedCustomMessages.has(signature)) {
 						break;
 					}
-					this.renderedCustomMessages.add(signature);
-					this.resetReadGroup();
+					this.#renderedCustomMessages.add(signature);
+					this.#resetReadGroup();
 					this.ctx.addMessageToChat(event.message);
 					this.ctx.ui.requestRender();
 				} else if (event.message.role === "user") {
-					this.resetReadGroup();
+					this.#resetReadGroup();
 					this.ctx.addMessageToChat(event.message);
 					if (!event.message.synthetic) {
 						this.ctx.editor.setText("");
@@ -92,12 +92,12 @@ export class EventController {
 					}
 					this.ctx.ui.requestRender();
 				} else if (event.message.role === "fileMention") {
-					this.resetReadGroup();
+					this.#resetReadGroup();
 					this.ctx.addMessageToChat(event.message);
 					this.ctx.ui.requestRender();
 				} else if (event.message.role === "assistant") {
-					this.lastThinkingCount = 0;
-					this.resetReadGroup();
+					this.#lastThinkingCount = 0;
+					this.#resetReadGroup();
 					this.ctx.streamingComponent = new AssistantMessageComponent(undefined, this.ctx.hideThinkingBlock);
 					this.ctx.streamingMessage = event.message;
 					this.ctx.chatContainer.addChild(this.ctx.streamingComponent);
@@ -114,9 +114,9 @@ export class EventController {
 					const thinkingCount = this.ctx.streamingMessage.content.filter(
 						content => content.type === "thinking" && content.thinking.trim(),
 					).length;
-					if (thinkingCount > this.lastThinkingCount) {
-						this.resetReadGroup();
-						this.lastThinkingCount = thinkingCount;
+					if (thinkingCount > this.#lastThinkingCount) {
+						this.#resetReadGroup();
+						this.#lastThinkingCount = thinkingCount;
 					}
 
 					for (const content of this.ctx.streamingMessage.content) {
@@ -124,13 +124,13 @@ export class EventController {
 
 						if (!this.ctx.pendingTools.has(content.id)) {
 							if (content.name === "read") {
-								const group = this.getReadGroup();
+								const group = this.#getReadGroup();
 								group.updateArgs(content.arguments, content.id);
 								this.ctx.pendingTools.set(content.id, group);
 								continue;
 							}
 
-							this.resetReadGroup();
+							this.#resetReadGroup();
 							this.ctx.chatContainer.addChild(new Text("", 0, 0));
 							const tool = this.ctx.session.getToolByName(content.name);
 							const component = new ToolExecutionComponent(
@@ -198,14 +198,14 @@ export class EventController {
 			case "tool_execution_start": {
 				if (!this.ctx.pendingTools.has(event.toolCallId)) {
 					if (event.toolName === "read") {
-						const group = this.getReadGroup();
+						const group = this.#getReadGroup();
 						group.updateArgs(event.args, event.toolCallId);
 						this.ctx.pendingTools.set(event.toolCallId, group);
 						this.ctx.ui.requestRender();
 						break;
 					}
 
-					this.resetReadGroup();
+					this.#resetReadGroup();
 					const tool = this.ctx.session.getToolByName(event.toolName);
 					const component = new ToolExecutionComponent(
 						event.toolName,

package/src/modes/controllers/extension-ui-controller.ts

@@ -18,10 +18,10 @@ import type { InteractiveModeContext } from "../../modes/types";
 import { setTerminalTitle } from "../../utils/title-generator";
 
 export class ExtensionUiController {
-	private hookSelectorOverlay: OverlayHandle | undefined;
-	private hookInputOverlay: OverlayHandle | undefined;
+	#hookSelectorOverlay: OverlayHandle | undefined;
+	#hookInputOverlay: OverlayHandle | undefined;
 
-	private readonly dialogOverlayOptions = {
+	readonly #dialogOverlayOptions = {
 		anchor: "bottom-center",
 		width: "80%",
 		minWidth: 40,
@@ -555,8 +555,8 @@ export class ExtensionUiController {
 		dialogOptions?: ExtensionUIDialogOptions,
 	): Promise<string | undefined> {
 		const { promise, resolve } = Promise.withResolvers<string | undefined>();
-		this.hookSelectorOverlay?.hide();
-		this.hookSelectorOverlay = undefined;
+		this.#hookSelectorOverlay?.hide();
+		this.#hookSelectorOverlay = undefined;
 		const maxVisible = Math.max(4, Math.min(15, this.ctx.ui.terminal.rows - 12));
 		this.ctx.hookSelector = new HookSelectorComponent(
 			title,
@@ -577,7 +577,7 @@ export class ExtensionUiController {
 				maxVisible,
 			},
 		);
-		this.hookSelectorOverlay = this.ctx.ui.showOverlay(this.ctx.hookSelector, this.dialogOverlayOptions);
+		this.#hookSelectorOverlay = this.ctx.ui.showOverlay(this.ctx.hookSelector, this.#dialogOverlayOptions);
 		return promise;
 	}
 
@@ -586,8 +586,8 @@ export class ExtensionUiController {
 	 */
 	hideHookSelector(): void {
 		this.ctx.hookSelector?.dispose();
-		this.hookSelectorOverlay?.hide();
-		this.hookSelectorOverlay = undefined;
+		this.#hookSelectorOverlay?.hide();
+		this.#hookSelectorOverlay = undefined;
 		this.ctx.hookSelector = undefined;
 		this.ctx.ui.setFocus(this.ctx.editor);
 		this.ctx.ui.requestRender();
@@ -606,8 +606,8 @@ export class ExtensionUiController {
 	 */
 	showHookInput(title: string, placeholder?: string): Promise<string | undefined> {
 		const { promise, resolve } = Promise.withResolvers<string | undefined>();
-		this.hookInputOverlay?.hide();
-		this.hookInputOverlay = undefined;
+		this.#hookInputOverlay?.hide();
+		this.#hookInputOverlay = undefined;
 		this.ctx.hookInput = new HookInputComponent(
 			title,
 			placeholder,
@@ -620,7 +620,7 @@ export class ExtensionUiController {
 				resolve(undefined);
 			},
 		);
-		this.hookInputOverlay = this.ctx.ui.showOverlay(this.ctx.hookInput, this.dialogOverlayOptions);
+		this.#hookInputOverlay = this.ctx.ui.showOverlay(this.ctx.hookInput, this.#dialogOverlayOptions);
 		return promise;
 	}
 
@@ -629,8 +629,8 @@ export class ExtensionUiController {
 	 */
 	hideHookInput(): void {
 		this.ctx.hookInput?.dispose();
-		this.hookInputOverlay?.hide();
-		this.hookInputOverlay = undefined;
+		this.#hookInputOverlay?.hide();
+		this.#hookInputOverlay = undefined;
 		this.ctx.hookInput = undefined;
 		this.ctx.ui.setFocus(this.ctx.editor);
 		this.ctx.ui.requestRender();

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

@@ -322,11 +322,6 @@ export class InputController {
 				this.ctx.editor.setText("");
 				return;
 			}
-			if (text === "/arminsayshi") {
-				this.ctx.handleArminSaysHi();
-				this.ctx.editor.setText("");
-				return;
-			}
 			if (text === "/resume") {
 				this.ctx.showSessionSelector();
 				this.ctx.editor.setText("");
@@ -338,6 +333,14 @@ export class InputController {
 				return;
 			}
 
+			// Handle MCP server management commands
+			if (text === "/mcp" || text.startsWith("/mcp ")) {
+				this.ctx.editor.addToHistory(text);
+				this.ctx.editor.setText("");
+				await this.ctx.handleMCPCommand(text);
+				return;
+			}
+
 			// Handle skill commands (/skill:name [args])
 			if (text.startsWith("/skill:")) {
 				const spaceIndex = text.indexOf(" ");
@@ -722,15 +725,15 @@ export class InputController {
 		this.ctx.showStatus(`Thinking blocks: ${this.ctx.hideThinkingBlock ? "hidden" : "visible"}`);
 	}
 
-	private getEditorTerminalPath(): string | null {
+	#getEditorTerminalPath(): string | null {
 		if (process.platform === "win32") {
 			return null;
 		}
 		return "/dev/tty";
 	}
 
-	private async openEditorTerminalHandle(): Promise<fs.FileHandle | null> {
-		const terminalPath = this.getEditorTerminalPath();
+	async #openEditorTerminalHandle(): Promise<fs.FileHandle | null> {
+		const terminalPath = this.#getEditorTerminalPath();
 		if (!terminalPath) {
 			return null;
 		}
@@ -752,7 +755,7 @@ export class InputController {
 
 		let ttyHandle: fs.FileHandle | null = null;
 		try {
-			ttyHandle = await this.openEditorTerminalHandle();
+			ttyHandle = await this.#openEditorTerminalHandle();
 			this.ctx.ui.stop();
 
 			const stdio: [number | "inherit", number | "inherit", number | "inherit"] = ttyHandle