@oh-my-pi/pi-coding-agent 3.1.1337 → 3.4.1337

package/src/modes/interactive/interactive-mode.ts

@@ -67,6 +67,7 @@ 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 { TtsrNotificationComponent } from "./components/ttsr-notification";
 import { UserMessageComponent } from "./components/user-message";
 import { UserMessageSelectorComponent } from "./components/user-message-selector";
 import { WelcomeComponent } from "./components/welcome";
@@ -1007,18 +1008,28 @@ export class InteractiveMode {
 				if (event.message.role === "user") break;
 				if (this.streamingComponent && event.message.role === "assistant") {
 					this.streamingMessage = event.message;
-					this.streamingComponent.updateContent(this.streamingMessage);
+					// Don't show "Aborted" text for TTSR aborts - we'll show a nicer message
+					if (this.session.isTtsrAbortPending && this.streamingMessage.stopReason === "aborted") {
+						// TTSR abort - suppress the "Aborted" rendering in the component
+						const msgWithoutAbort = { ...this.streamingMessage, stopReason: "stop" as const };
+						this.streamingComponent.updateContent(msgWithoutAbort);
+					} else {
+						this.streamingComponent.updateContent(this.streamingMessage);
+					}
 
 					if (this.streamingMessage.stopReason === "aborted" || this.streamingMessage.stopReason === "error") {
-						const errorMessage =
-							this.streamingMessage.stopReason === "aborted"
-								? "Operation aborted"
-								: this.streamingMessage.errorMessage || "Error";
-						for (const [, component] of this.pendingTools.entries()) {
-							component.updateResult({
-								content: [{ type: "text", text: errorMessage }],
-								isError: true,
-							});
+						// Skip error handling for TTSR aborts
+						if (!this.session.isTtsrAbortPending) {
+							const errorMessage =
+								this.streamingMessage.stopReason === "aborted"
+									? "Operation aborted"
+									: this.streamingMessage.errorMessage || "Error";
+							for (const [, component] of this.pendingTools.entries()) {
+								component.updateResult({
+									content: [{ type: "text", text: errorMessage }],
+									isError: true,
+								});
+							}
 						}
 						this.pendingTools.clear();
 					} else {
@@ -1188,6 +1199,15 @@ export class InteractiveMode {
 				this.ui.requestRender();
 				break;
 			}
+
+			case "ttsr_triggered": {
+				// Show a fancy notification when TTSR rules are triggered
+				const component = new TtsrNotificationComponent(event.rules);
+				component.setExpanded(this.toolOutputExpanded);
+				this.chatContainer.addChild(component);
+				this.ui.requestRender();
+				break;
+			}
 		}
 	}
 
@@ -1617,7 +1637,7 @@ export class InteractiveMode {
 				theme.bold(theme.fg("warning", "Update Available")) +
 					"\n" +
 					theme.fg("muted", `New version ${newVersion} is available. Run: `) +
-					theme.fg("accent", "npm install -g @oh-my-pi/pi-coding-agent"),
+					theme.fg("accent", "omp update"),
 				1,
 				0,
 			),
@@ -2391,14 +2411,26 @@ export class InteractiveMode {
 	}
 
 	private handleStatusCommand(): void {
-		const sections: string[] = [];
-
 		type StatusSource =
 			| { provider: string; level: string }
 			| { mcpServer: string; provider?: string }
 			| "builtin"
 			| "unknown";
 
+		type StatusLine = {
+			name: string;
+			sourceText: string;
+			nameWithSource: string;
+			desc?: string;
+		};
+
+		type LineSection = {
+			title: string;
+			lines: StatusLine[];
+		};
+
+		type Section = { kind: "lines"; section: LineSection } | { kind: "text"; text: string };
+
 		const capitalize = (value: string): string => value.charAt(0).toUpperCase() + value.slice(1);
 
 		const resolveSourceText = (source: StatusSource): string => {
@@ -2440,29 +2472,28 @@ export class InteractiveMode {
 			return `${acc}...`;
 		};
 
-		// Helper to format a section with consistent column alignment
-		const formatSection = <T>(
+		const buildLineSection = <T>(
 			title: string,
 			items: readonly T[],
 			getName: (item: T) => string,
 			getDesc: (item: T) => string | undefined,
 			getSource: (item: T) => StatusSource,
-		): string => {
-			if (items.length === 0) return "";
+		): LineSection | null => {
+			if (items.length === 0) return null;
 
-			const lineItems = items.map((item) => {
+			const lines = items.map((item) => {
 				const name = getName(item);
-				const desc = getDesc(item);
+				const desc = getDesc(item)?.trim();
 				const sourceText = resolveSourceText(getSource(item));
 				const nameWithSource = sourceText ? `${name} ${sourceText}` : name;
 				return { name, sourceText, nameWithSource, desc };
 			});
 
-			const maxNameWidth = Math.min(
-				60,
-				Math.max(...lineItems.map((line) => visibleWidth(line.nameWithSource))),
-			);
-			const formattedLines = lineItems.map((line) => {
+			return { title, lines };
+		};
+
+		const renderLineSection = (section: LineSection, maxNameWidth: number): string => {
+			const formattedLines = section.lines.map((line) => {
 				let nameText = line.name;
 				let sourceText = line.sourceText;
 
@@ -2471,103 +2502,97 @@ export class InteractiveMode {
 					sourceText = truncateText(sourceText, maxSourceWidth);
 				}
 				const sourceWidth = sourceText ? visibleWidth(sourceText) : 0;
-				const availableForName = sourceText
-					? Math.max(1, maxNameWidth - sourceWidth - 1)
-					: maxNameWidth;
+				const availableForName = sourceText ? Math.max(1, maxNameWidth - sourceWidth - 1) : maxNameWidth;
 				nameText = truncateText(nameText, availableForName);
 
 				const nameWithSourcePlain = sourceText ? `${nameText} ${sourceText}` : nameText;
 				const sourceRendered = sourceText ? renderSourceText(sourceText) : "";
 				const nameRendered = sourceText ? `${theme.bold(nameText)} ${sourceRendered}` : theme.bold(nameText);
 				const pad = Math.max(0, maxNameWidth - visibleWidth(nameWithSourcePlain));
-				const desc = line.desc?.trim();
+				const desc = line.desc;
 				const descPart = desc ? `  ${theme.fg("dim", desc.slice(0, 50) + (desc.length > 50 ? "..." : ""))}` : "";
 				return `  ${nameRendered}${" ".repeat(pad)}${descPart}`;
 			});
 
-			return `${theme.bold(theme.fg("accent", title))}\n${formattedLines.join("\n")}`;
+			return `${theme.bold(theme.fg("accent", section.title))}\n${formattedLines.join("\n")}`;
+		};
+
+		const sections: Section[] = [];
+		const pushLineSection = <T>(
+			title: string,
+			items: readonly T[],
+			getName: (item: T) => string,
+			getDesc: (item: T) => string | undefined,
+			getSource: (item: T) => StatusSource,
+		): void => {
+			const section = buildLineSection(title, items, getName, getDesc, getSource);
+			if (section) {
+				sections.push({ kind: "lines", section });
+			}
 		};
 
 		// Loaded context files
 		const contextFilesResult = loadSync(contextFileCapability.id, { cwd: process.cwd() });
 		const contextFiles = contextFilesResult.items as ContextFile[];
-		if (contextFiles.length > 0) {
-			sections.push(
-				formatSection(
-					"Context Files",
-					contextFiles,
-					(f) => basename(f.path),
-					() => undefined,
-					(f) => ({ provider: f._source.providerName, level: f.level }),
-				),
-			);
-		}
+		pushLineSection(
+			"Context Files",
+			contextFiles,
+			(f) => basename(f.path),
+			() => undefined,
+			(f) => ({ provider: f._source.providerName, level: f.level }),
+		);
 
 		// Loaded skills
 		const skillsSettings = this.session.skillsSettings;
 		if (skillsSettings?.enabled !== false) {
 			const { skills, warnings: skillWarnings } = loadSkills(skillsSettings ?? {});
-			if (skills.length > 0) {
-				sections.push(
-					formatSection(
-						"Skills",
-						skills,
-						(s) => s.name,
-						(s) => s.description,
-						(s) => (s._source ? { provider: s._source.providerName, level: s._source.level } : "unknown"),
-					),
-				);
-			}
+			pushLineSection(
+				"Skills",
+				skills,
+				(s) => s.name,
+				(s) => s.description,
+				(s) => (s._source ? { provider: s._source.providerName, level: s._source.level } : "unknown"),
+			);
 			if (skillWarnings.length > 0) {
-				sections.push(
-					theme.bold(theme.fg("warning", "Skill Warnings")) +
+				sections.push({
+					kind: "text",
+					text:
+						theme.bold(theme.fg("warning", "Skill Warnings")) +
 						"\n" +
 						skillWarnings.map((w) => theme.fg("warning", `  ${w.skillPath}: ${w.message}`)).join("\n"),
-				);
+				});
 			}
 		}
 
 		// Loaded rules
 		const rulesResult = loadSync<Rule>(ruleCapability.id, { cwd: process.cwd() });
-		if (rulesResult.items.length > 0) {
-			sections.push(
-				formatSection(
-					"Rules",
-					rulesResult.items,
-					(r) => r.name,
-					(r) => r.description,
-					(r) => ({ provider: r._source.providerName, level: r._source.level }),
-				),
-			);
-		}
+		pushLineSection(
+			"Rules",
+			rulesResult.items,
+			(r) => r.name,
+			(r) => r.description,
+			(r) => ({ provider: r._source.providerName, level: r._source.level }),
+		);
 
 		// Loaded prompts
 		const promptsResult = loadSync<Prompt>(promptCapability.id, { cwd: process.cwd() });
-		if (promptsResult.items.length > 0) {
-			sections.push(
-				formatSection(
-					"Prompts",
-					promptsResult.items,
-					(p) => p.name,
-					() => undefined,
-					(p) => ({ provider: p._source.providerName, level: p._source.level }),
-				),
-			);
-		}
+		pushLineSection(
+			"Prompts",
+			promptsResult.items,
+			(p) => p.name,
+			() => undefined,
+			(p) => ({ provider: p._source.providerName, level: p._source.level }),
+		);
 
 		// Loaded instructions
 		const instructionsResult = loadSync<Instruction>(instructionCapability.id, { cwd: process.cwd() });
-		if (instructionsResult.items.length > 0) {
-			sections.push(
-				formatSection(
-					"Instructions",
-					instructionsResult.items,
-					(i) => i.name,
-					(i) => (i.applyTo ? `applies to: ${i.applyTo}` : undefined),
-					(i) => ({ provider: i._source.providerName, level: i._source.level }),
-				),
-			);
-		}
+		pushLineSection(
+			"Instructions",
+			instructionsResult.items,
+			(i) => i.name,
+			(i) => (i.applyTo ? `applies to: ${i.applyTo}` : undefined),
+			(i) => ({ provider: i._source.providerName, level: i._source.level }),
+		);
 
 		// Loaded custom tools - split MCP from non-MCP
 		if (this.customTools.size > 0) {
@@ -2577,68 +2602,74 @@ export class InteractiveMode {
 
 			// MCP Tools section
 			if (mcpTools.length > 0) {
-				sections.push(
-					formatSection(
-						"MCP Tools",
-						mcpTools,
-						(ct) => ct.tool.label || ct.tool.name,
-						() => undefined,
-						(ct) => {
-							const match = ct.path.match(/^mcp:(.+?) via (.+)$/);
-							if (match) {
-								const [, serverName, providerName] = match;
-								return { mcpServer: serverName, provider: providerName };
-							}
-							return ct.path.startsWith("mcp:") ? { mcpServer: ct.path.slice(4) } : "unknown";
-						},
-					),
+				pushLineSection(
+					"MCP Tools",
+					mcpTools,
+					(ct) => ct.tool.label || ct.tool.name,
+					() => undefined,
+					(ct) => {
+						const match = ct.path.match(/^mcp:(.+?) via (.+)$/);
+						if (match) {
+							const [, serverName, providerName] = match;
+							return { mcpServer: serverName, provider: providerName };
+						}
+						return ct.path.startsWith("mcp:") ? { mcpServer: ct.path.slice(4) } : "unknown";
+					},
 				);
 			}
 
 			// Custom Tools section
 			if (customTools.length > 0) {
-				sections.push(
-					formatSection(
-						"Custom Tools",
-						customTools,
-						(ct) => ct.tool.label || ct.tool.name,
-						(ct) => ct.tool.description,
-						(ct) => {
-							if (ct.source?.provider === "builtin") return "builtin";
-							if (ct.path === "<exa>") return "builtin";
-							return ct.source ? { provider: ct.source.providerName, level: ct.source.level } : "unknown";
-						},
-					),
+				pushLineSection(
+					"Custom Tools",
+					customTools,
+					(ct) => ct.tool.label || ct.tool.name,
+					(ct) => ct.tool.description,
+					(ct) => {
+						if (ct.source?.provider === "builtin") return "builtin";
+						if (ct.path === "<exa>") return "builtin";
+						return ct.source ? { provider: ct.source.providerName, level: ct.source.level } : "unknown";
+					},
 				);
 			}
 		}
 
 		// Loaded slash commands (file-based)
 		const fileCommands = this.session.fileCommands;
-		if (fileCommands.length > 0) {
-			sections.push(
-				formatSection(
-					"Slash Commands",
-					fileCommands,
-					(cmd) => `/${cmd.name}`,
-					(cmd) => cmd.description,
-					(cmd) => (cmd._source ? { provider: cmd._source.providerName, level: cmd._source.level } : "unknown"),
-				),
-			);
-		}
+		pushLineSection(
+			"Slash Commands",
+			fileCommands,
+			(cmd) => `/${cmd.name}`,
+			(cmd) => cmd.description,
+			(cmd) => (cmd._source ? { provider: cmd._source.providerName, level: cmd._source.level } : "unknown"),
+		);
 
 		// Loaded hooks
 		const hookRunner = this.session.hookRunner;
 		if (hookRunner) {
 			const hookPaths = hookRunner.getHookPaths();
 			if (hookPaths.length > 0) {
-				sections.push(
-					`${theme.bold(theme.fg("accent", "Hooks"))}\n${hookPaths.map((p) => `  ${theme.bold(basename(p))} ${theme.fg("dim", "hook")}`).join("\n")}`,
-				);
+				sections.push({
+					kind: "text",
+					text:
+						`${theme.bold(theme.fg("accent", "Hooks"))}\n` +
+						hookPaths.map((p) => `  ${theme.bold(basename(p))} ${theme.fg("dim", "hook")}`).join("\n"),
+				});
 			}
 		}
 
-		if (sections.length === 0) {
+		const lineSections = sections.filter((section): section is { kind: "lines"; section: LineSection } => {
+			return section.kind === "lines";
+		});
+		const allLines = lineSections.flatMap((section) => section.section.lines);
+		const maxNameWidth = allLines.length
+			? Math.min(60, Math.max(...allLines.map((line) => visibleWidth(line.nameWithSource))))
+			: 0;
+		const renderedSections = sections
+			.map((section) => (section.kind === "lines" ? renderLineSection(section.section, maxNameWidth) : section.text))
+			.filter((section) => section.length > 0);
+
+		if (renderedSections.length === 0) {
 			this.chatContainer.addChild(new Spacer(1));
 			this.chatContainer.addChild(new Text(theme.fg("muted", "No extensions loaded."), 1, 0));
 		} else {
@@ -2646,7 +2677,7 @@ export class InteractiveMode {
 			this.chatContainer.addChild(new DynamicBorder());
 			this.chatContainer.addChild(new Text(theme.bold(theme.fg("accent", "Loaded Extensions")), 1, 0));
 			this.chatContainer.addChild(new Spacer(1));
-			for (const section of sections) {
+			for (const section of renderedSections) {
 				this.chatContainer.addChild(new Text(section, 1, 0));
 				this.chatContainer.addChild(new Spacer(1));
 			}

package/src/modes/print-mode.ts

@@ -2,8 +2,8 @@
  * Print mode (single-shot): Send prompts, output result, exit.
  *
  * Used for:
- * - `pi -p "prompt"` - text output
- * - `pi --mode json "prompt"` - JSON event stream
+ * - `omp -p "prompt"` - text output
+ * - `omp --mode json "prompt"` - JSON event stream
  */
 
 import type { AssistantMessage, ImageContent } from "@oh-my-pi/pi-ai";