@nmzpy/pi-ember-stack 0.1.4 → 0.1.6

package/README.md

@@ -30,8 +30,8 @@ plugins under `plugins/`. Ember projects enable them in `.pi/ember-stack.json`:
 Remove a plugin ID to disable it, or use `/stack-plugins` to toggle one from
 the TUI. Restart pi after changing the list. The available plugins are:
 
-- `pi-compact-tools`: collapsed native edit rendering and questionnaire UI.
-- `pi-custom-agents`: primary modes, plans, subagent tool, and bundled agent definitions.
+- `pi-compact-tools`: collapsed native edit rendering.
+- `pi-custom-agents`: questionnaire UI, primary modes, plans, subagent tool, and bundled agent definitions.
 - `devin-auth`: Devin provider, OAuth, catalog refresh, and streaming.
 
 ## Project setup
@@ -39,7 +39,7 @@ the TUI. Restart pi after changing the list. The available plugins are:
 The Ember repository contains a project-local `.pi/settings.json` entry for:
 
 ```json
-"npm:@nmzpy/pi-ember-stack@0.1.4"
+"npm:@nmzpy/pi-ember-stack@0.1.6"
 ```
 
 On a new clone, start pi from the project directory. Pi will ask for a
@@ -69,9 +69,9 @@ of this repository.
 ## Development
 
 The package entrypoint is `plugins/index.ts`. Compact tools are under
-`plugins/pi-compact-tools/`, while primary modes, plans, subagents, and bundled
-agents are under `plugins/pi-custom-agents/`. Devin auth is under
-`plugins/devin-auth/`.
+`plugins/pi-compact-tools/`, while questionnaire, primary modes, plans,
+subagents, and bundled agents are under `plugins/pi-custom-agents/`. Devin auth
+is under `plugins/devin-auth/`.
 
 Run the package typecheck with:
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nmzpy/pi-ember-stack",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Ember's configurable pi plugin stack with modes, questionnaire, compact edits, subagents, and Devin auth",
   "type": "module",
   "license": "MIT",

package/plugins/index.ts

@@ -4,18 +4,13 @@ import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
 import devinAuthPlugin from "./devin-auth/extensions/index.ts";
 import piCompactToolsPlugin from "./pi-compact-tools/index.ts";
-import piCustomAgentsPlugin, {
-	type PiCustomAgentsOptions,
-} from "./pi-custom-agents/index.ts";
+import piCustomAgentsPlugin from "./pi-custom-agents/index.ts";
 
 type PluginId = "pi-compact-tools" | "pi-custom-agents" | "devin-auth";
 type StackPlugin = {
 	id: PluginId;
 	description: string;
-	extension: (
-		pi: ExtensionAPI,
-		options?: PiCustomAgentsOptions,
-	) => void | Promise<void>;
+	extension: (pi: ExtensionAPI) => void | Promise<void>;
 };
 
 type StackPluginConfig = {
@@ -32,12 +27,12 @@ const DEFAULT_PLUGIN_IDS: readonly PluginId[] = [
 const PLUGINS: readonly StackPlugin[] = [
 	{
 		id: "pi-compact-tools",
-		description: "Collapsed native edit rendering and questionnaire UI",
+		description: "Collapsed native edit rendering",
 		extension: piCompactToolsPlugin,
 	},
 	{
 		id: "pi-custom-agents",
-		description: "Primary modes, plans, subagents, and bundled agent definitions",
+		description: "Questionnaire, primary modes, plans, subagents, and bundled agent definitions",
 		extension: piCustomAgentsPlugin,
 	},
 	{
@@ -135,12 +130,9 @@ function registerPluginCommand(
 export default async function piEmberStackPlugin(pi: ExtensionAPI): Promise<void> {
 	const cwd = process.cwd();
 	const enabledPlugins = readEnabledPlugins(cwd);
-	const pluginOptions: PiCustomAgentsOptions = {
-		compactToolsEnabled: enabledPlugins.has("pi-compact-tools"),
-	};
 	for (const plugin of PLUGINS) {
 		if (!enabledPlugins.has(plugin.id)) continue;
-		await plugin.extension(pi, pluginOptions);
+		await plugin.extension(pi);
 	}
 	registerPluginCommand(pi, cwd, enabledPlugins);
 }

package/plugins/pi-compact-tools/index.ts

@@ -1,62 +1,195 @@
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
-import { createEditTool } from "@earendil-works/pi-coding-agent";
-import { Text } from "@earendil-works/pi-tui";
-
-import { registerQuestionnaireTool } from "./questionnaire-tool.ts";
+import {
+	createBashTool,
+	createEditTool,
+	createFindTool,
+	createGrepTool,
+	createLsTool,
+	createReadTool,
+	createWriteTool,
+	type ExtensionAPI,
+} from "@earendil-works/pi-coding-agent";
+import { Text, type Component } from "@earendil-works/pi-tui";
 
 const SOURCE_ROOT = path.dirname(fileURLToPath(import.meta.url));
+const BULLET = "• ";
+const DISCOVERY_TOOLS = new Set(["read", "grep", "find", "ls"]);
 
-function registerCollapsedEditTool(extensionApi: any): void {
-	const editDefinition = createEditTool(SOURCE_ROOT);
-	extensionApi.registerTool({
-		name: "edit",
-		label: "edit",
-		description: editDefinition.description,
-		parameters: editDefinition.parameters,
-		renderShell: "self",
+type ToolFactory = (cwd: string) => any;
+type ToolRenderContext = {
+	args: any;
+	toolCallId: string;
+	invalidate: () => void;
+};
+type ToolRenderResultOptions = {
+	isPartial: boolean;
+};
+type CompactCall = {
+	id: string;
+	name: string;
+	args: any;
+	group?: DiscoveryGroup;
+	invalidate?: () => void;
+	isError: boolean;
+};
+type DiscoveryGroup = {
+	records: CompactCall[];
+};
 
-		async execute(
-			toolCallId: string,
-			params: any,
-			signal: AbortSignal,
-			onUpdate: any,
-			ctx: any,
-		) {
-			return createEditTool(ctx.cwd).execute(
-				toolCallId,
-				params,
-				signal,
-				onUpdate,
-			);
-		},
+function textValue(value: unknown, fallback = ""): string {
+	if (value === undefined || value === null) return fallback;
+	return String(value).replace(/[\r\n]+/g, " ");
+}
 
-		renderCall(args: any, theme: any): any {
-			const filePath = String(args?.path ?? args?.file_path ?? "");
-			return new Text(
-				theme.fg("toolTitle", theme.bold("edit ")) +
-					theme.fg("accent", filePath),
-				0,
-				0,
-			);
-		},
+function toolPath(args: any): string {
+	return textValue(args?.file_path ?? args?.path, ".");
+}
+
+function errorText(result: any, isError: boolean): string | undefined {
+	const content = result?.content?.find((item: any) => item.type === "text");
+	if (!isError && !content?.text?.startsWith("Error")) return undefined;
+	return textValue(content?.text, "Tool failed").split("\n")[0];
+}
+
+function diffStats(result: any): { additions: number; removals: number } {
+	const diff = typeof result?.details?.diff === "string" ? result.details.diff : "";
+	let additions = 0;
+	let removals = 0;
+	for (const line of diff.split("\n")) {
+		if (line.startsWith("+") && !line.startsWith("+++")) additions++;
+		if (line.startsWith("-") && !line.startsWith("---")) removals++;
+	}
+	return { additions, removals };
+}
+
+function formatCallBody(name: string, args: any, theme: any): string {
+	const pathName = toolPath(args);
+	switch (name) {
+		case "read":
+			return theme.fg("toolTitle", theme.bold("Read")) +
+				theme.fg("accent", ` ${pathName}`);
+		case "grep":
+			return theme.fg("toolTitle", theme.bold("Search")) +
+				theme.fg("accent", ` ${textValue(args?.pattern)}`) +
+				theme.fg("toolOutput", ` in ${pathName}`);
+		case "find":
+			return theme.fg("toolTitle", theme.bold("Find")) +
+				theme.fg("accent", ` ${textValue(args?.pattern)}`) +
+				theme.fg("toolOutput", ` in ${pathName}`);
+		case "ls":
+			return theme.fg("toolTitle", theme.bold("List")) +
+				theme.fg("accent", ` ${pathName}`);
+		case "bash":
+			return theme.fg("toolTitle", theme.bold("Run")) +
+				theme.fg("accent", ` $ ${textValue(args?.command)}`);
+		case "edit":
+			return theme.fg("toolTitle", theme.bold("edit")) +
+				theme.fg("accent", ` ${pathName}`);
+		case "write":
+			return theme.fg("toolTitle", theme.bold("write")) +
+				theme.fg("accent", ` ${pathName}`);
+		default:
+			return theme.fg("toolTitle", theme.bold(name));
+	}
+}
 
-		renderResult(result: any, { isPartial }: any, theme: any): any {
-			if (isPartial) return new Text(theme.fg("warning", "Editing..."), 0, 0);
+function formatGroup(group: DiscoveryGroup, theme: any): string {
+	const lines = [
+		theme.fg("muted", BULLET) + theme.fg("toolTitle", theme.bold("Explored")),
+	];
+	for (const [index, record] of group.records.entries()) {
+		const prefix = index === 0 ? "  └ " : "    ";
+		lines.push(theme.fg("dim", prefix) + formatCallBody(record.name, record.args, theme));
+	}
+	return lines.join("\n");
+}
+
+class CompactRenderer {
+	private readonly calls = new Map<string, CompactCall>();
+	private lastCall: CompactCall | undefined;
+
+	beginTurn(): void {
+		this.lastCall = undefined;
+	}
+
+	observeCall(name: string, id: string, args: any): CompactCall {
+		return this.registerCall(name, id, args);
+	}
+
+	registerCall(
+		name: string,
+		id: string,
+		args: any,
+		invalidate?: () => void,
+	): CompactCall {
+		const existing = this.calls.get(id);
+		if (existing) {
+			existing.args = args;
+			existing.invalidate = invalidate ?? existing.invalidate;
+			return existing;
+		}
+
+		const record: CompactCall = { id, name, args, isError: false };
+		this.calls.set(id, record);
+		if (DISCOVERY_TOOLS.has(name) && this.lastCall && DISCOVERY_TOOLS.has(this.lastCall.name)) {
+			const group = this.lastCall.group ?? { records: [this.lastCall] };
+			this.lastCall.group = group;
+			group.records.push(record);
+			record.group = group;
+			for (const groupedCall of group.records) groupedCall.invalidate?.();
+		}
+		this.lastCall = record;
+		record.invalidate = invalidate;
+		return record;
+	}
 
-			const content = result.content?.find((item: any) => item.type === "text");
-			if (content?.text?.startsWith("Error")) {
-				return new Text(theme.fg("error", content.text.split("\n")[0]), 0, 0);
-			}
+	setResult(record: CompactCall, result: any, isError: boolean): void {
+		record.isError = isError;
+		if (record.group) {
+			record.group.records[0]?.invalidate?.();
+		}
+	}
 
-			const diff = typeof result.details?.diff === "string" ? result.details.diff : "";
-			let additions = 0;
-			let removals = 0;
-			for (const line of diff.split("\n")) {
-				if (line.startsWith("+") && !line.startsWith("+++")) additions++;
-				if (line.startsWith("-") && !line.startsWith("---")) removals++;
-			}
+	renderCall(
+		name: string,
+		args: any,
+		theme: any,
+		context: ToolRenderContext,
+	): Component {
+		const record = this.registerCall(name, context.toolCallId, args, context.invalidate);
+		if (record.group && record.group.records.length > 1) {
+			if (record.group.records[0] !== record) return new Text("", 0, 0);
+			return new Text(formatGroup(record.group, theme), 0, 0);
+		}
+		return new Text(
+			theme.fg("muted", BULLET) + formatCallBody(name, args, theme),
+			0,
+			0,
+		);
+	}
 
+	renderResult(
+		name: string,
+		args: any,
+		result: any,
+		options: ToolRenderResultOptions,
+		theme: any,
+		context: ToolRenderContext & { isError: boolean },
+	): Component {
+		const record = this.registerCall(name, context.toolCallId, args, context.invalidate);
+		this.setResult(record, result, context.isError);
+		if (record.group && record.group.records.length > 1) {
+			if (record.group.records[0] !== record) return new Text("", 0, 0);
+			const error = errorText(result, context.isError);
+			return error ? new Text(theme.fg("error", error), 0, 0) : new Text("", 0, 0);
+		}
+		if (options.isPartial) return new Text("", 0, 0);
+
+		const error = errorText(result, context.isError);
+		if (error) return new Text(theme.fg("error", error), 0, 0);
+		if (name === "edit") {
+			const { additions, removals } = diffStats(result);
 			return new Text(
 				theme.fg("success", `+${additions}`) +
 					theme.fg("dim", " / ") +
@@ -64,11 +197,71 @@ function registerCollapsedEditTool(extensionApi: any): void {
 				0,
 				0,
 			);
+		}
+		if (name === "bash") return new Text(theme.fg("success", "Done"), 0, 0);
+		if (name === "write") return new Text(theme.fg("success", "Written"), 0, 0);
+		return new Text("", 0, 0);
+	}
+}
+
+const TOOL_FACTORIES: Record<string, ToolFactory> = {
+	bash: createBashTool,
+	edit: createEditTool,
+	find: createFindTool,
+	grep: createGrepTool,
+	ls: createLsTool,
+	read: createReadTool,
+	write: createWriteTool,
+};
+
+function registerCompactTool(
+	pi: ExtensionAPI,
+	name: string,
+	factory: ToolFactory,
+	renderer: CompactRenderer,
+): void {
+	const definition = factory(SOURCE_ROOT);
+	pi.registerTool({
+		name,
+		label: name,
+		description: definition.description,
+		parameters: definition.parameters,
+		renderShell: "self",
+
+		async execute(
+			toolCallId: string,
+			params: any,
+			signal: AbortSignal,
+			onUpdate: any,
+			ctx: any,
+		) {
+			return factory(ctx.cwd).execute(toolCallId, params, signal, onUpdate);
+		},
+
+		renderCall(args: any, theme: any, context: ToolRenderContext): Component {
+			return renderer.renderCall(name, args, theme, context);
+		},
+
+		renderResult(
+			result: any,
+			options: ToolRenderResultOptions,
+			theme: any,
+			context: ToolRenderContext & { isError: boolean },
+		): Component {
+			return renderer.renderResult(name, context.args, result, options, theme, context);
 		},
 	});
 }
 
-export default function piCompactToolsPlugin(pi: any): void {
-	registerQuestionnaireTool(pi);
-	registerCollapsedEditTool(pi);
+export default function piCompactToolsPlugin(pi: ExtensionAPI): void {
+	const renderer = new CompactRenderer();
+	pi.on("turn_start", () => renderer.beginTurn());
+	pi.on("tool_call", (event: any) => {
+		if (TOOL_FACTORIES[event.toolName]) {
+			renderer.observeCall(event.toolName, event.toolCallId, event.input);
+		}
+	});
+	for (const [name, factory] of Object.entries(TOOL_FACTORIES)) {
+		registerCompactTool(pi, name, factory, renderer);
+	}
 }

package/plugins/pi-custom-agents/index.ts

@@ -24,7 +24,8 @@ import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import {
 	askQuestionnaire,
 	type QuestionnaireQuestion,
-} from "../pi-compact-tools/questionnaire-tool.ts";
+	registerQuestionnaireTool,
+} from "./questionnaire-tool.ts";
 import subagentPlugin from "./subagent/extensions/index.ts";
 
 function formatTokens(count: number): string {
@@ -558,21 +559,11 @@ function getLastModeFromSession(ctx: any): string | null {
 	return null;
 }
 
-export type PiCustomAgentsOptions = {
-	compactToolsEnabled: boolean;
-};
-
-export default async function piCustomAgentsPlugin(
-	pi: any,
-	options: PiCustomAgentsOptions = { compactToolsEnabled: true },
-) {
+export default async function piCustomAgentsPlugin(pi: any): Promise<void> {
 	let currentMode: string = DEFAULT_MODE;
 	let lastMessagedMode: string | null = null;
 	let waitingForPlan = false;
-	const compactToolsEnabled = options.compactToolsEnabled;
-	const toolsForMode = (tools: string[]): string[] => compactToolsEnabled
-		? tools
-		: tools.filter((toolName) => toolName !== "questionnaire");
+	registerQuestionnaireTool(pi);
 
 	for (const modeId of MODE_IDS) {
 		const mode = MODES[modeId];
@@ -602,11 +593,11 @@ export default async function piCustomAgentsPlugin(
 		const mode = MODES[modeId];
 		if (!mode) return;
 		currentMode = modeId;
-		pi.setActiveTools(toolsForMode(mode.tools));
+		pi.setActiveTools(mode.tools);
 		if (modeId === DEFAULT_MODE) {
 			ctx.ui.notify("Coder mode. Full access restored.");
 		} else {
-			ctx.ui.notify(`${mode.label} mode enabled. Tools: ${toolsForMode(mode.tools).join(", ")}`);
+			ctx.ui.notify(`${mode.label} mode enabled. Tools: ${mode.tools.join(", ")}`);
 		}
 		updateStatus(ctx);
 	}
@@ -903,11 +894,11 @@ export default async function piCustomAgentsPlugin(
 		if (restored && restored !== DEFAULT_MODE) {
 			currentMode = restored;
 			lastMessagedMode = restored;
-			pi.setActiveTools(toolsForMode(MODES[restored].tools));
+			pi.setActiveTools(MODES[restored].tools);
 		} else {
 			currentMode = DEFAULT_MODE;
 			lastMessagedMode = null;
-			pi.setActiveTools(toolsForMode(FULL_TOOLS));
+			pi.setActiveTools(FULL_TOOLS);
 		}
 		installCustomFooter(ctx);
 		updateStatus(ctx);
@@ -918,11 +909,11 @@ export default async function piCustomAgentsPlugin(
 		if (restored && restored !== DEFAULT_MODE) {
 			currentMode = restored;
 			lastMessagedMode = restored;
-			pi.setActiveTools(toolsForMode(MODES[restored].tools));
+			pi.setActiveTools(MODES[restored].tools);
 		} else {
 			currentMode = DEFAULT_MODE;
 			lastMessagedMode = null;
-			pi.setActiveTools(toolsForMode(FULL_TOOLS));
+			pi.setActiveTools(FULL_TOOLS);
 		}
 		updateStatus(ctx);
 		installCustomFooter(ctx);

package/plugins/{pi-compact-tools → pi-custom-agents}/questionnaire-tool.ts

@@ -259,6 +259,7 @@ export function registerQuestionnaireTool(pi: any): void {
 		renderCall(args: { questions?: QuestionnaireQuestion[] }, theme: any): any {
 			const count = args.questions?.length ?? 0;
 			return new Text(
+				theme.fg("muted", "• ") +
 				theme.fg("toolTitle", theme.bold("questionnaire ")) +
 					theme.fg("muted", `${count} question${count === 1 ? "" : "s"}`),
 				0,

package/plugins/pi-custom-agents/subagent/extensions/index.ts

@@ -756,6 +756,7 @@ export default function (pi: ExtensionAPI) {
 			// Chain
 			if (args.chain && args.chain.length > 0) {
 				let text =
+					fg("muted", "• ") +
 					fg("toolTitle", theme.bold("subagent ")) +
 					fg("accent", `chain (${args.chain.length} steps)`) +
 					fg("muted", ` [${scope}]`);
@@ -778,6 +779,7 @@ export default function (pi: ExtensionAPI) {
 			// Parallel
 			if (args.tasks && args.tasks.length > 0) {
 				let text =
+					fg("muted", "• ") +
 					fg("toolTitle", theme.bold("subagent ")) +
 					fg("accent", `parallel (${args.tasks.length} tasks)`) +
 					fg("muted", ` [${scope}]`);
@@ -798,6 +800,7 @@ export default function (pi: ExtensionAPI) {
 					: args.task
 				: "...";
 			let text =
+				fg("muted", "• ") +
 				fg("toolTitle", theme.bold("subagent ")) +
 				fg("accent", agentName) +
 				fg("muted", ` [${scope}]`);
@@ -1215,4 +1218,4 @@ export default function (pi: ExtensionAPI) {
 			}
 		}, { overlay: true, overlayOptions: { maxHeight: "70%" } }); // Overlay: editor stays visible below
 	}
-}
+}