@nmzpy/pi-ember-stack 0.1.2 → 0.1.4

package/ATTRIBUTION.md

@@ -1,10 +1,11 @@
 # Attribution
 
-`plugins/subagent/extensions/` and the upstream bundled agent files were vendored
+`plugins/pi-custom-agents/subagent/extensions/` and the upstream bundled agent
+files were vendored
 from `@bacnh85/pi-subagent` version `0.5.0`.
 
 The upstream package declares the MIT license. The vendored subtree retains
-that license in `plugins/subagent/LICENSE`, along with the original README, agent
+that license in `plugins/pi-custom-agents/subagent/LICENSE`, along with the original README, agent
 format documentation, bundled roles, package version, and attribution.
 Upstream project: <https://github.com/bacnh85/pi-extensions>.
 

package/README.md

@@ -23,15 +23,15 @@ plugins under `plugins/`. Ember projects enable them in `.pi/ember-stack.json`:
 
 ```json
 {
-  "plugins": ["ember", "subagent", "devin-auth"]
+  "plugins": ["pi-compact-tools", "pi-custom-agents", "devin-auth"]
 }
 ```
 
 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:
 
-- `ember`: modes, questionnaire, footer, and compact edit rendering.
-- `subagent`: bundled subagent tool and agent definitions.
+- `pi-compact-tools`: collapsed native edit rendering and questionnaire UI.
+- `pi-custom-agents`: 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.2"
+"npm:@nmzpy/pi-ember-stack@0.1.4"
 ```
 
 On a new clone, start pi from the project directory. Pi will ask for a
@@ -68,9 +68,10 @@ of this repository.
 
 ## Development
 
-The package entrypoint is `plugins/index.ts`. Ember functionality is under
-`plugins/ember/`, subagents and bundled agents are under `plugins/subagent/`,
-and Devin auth is under `plugins/devin-auth/`.
+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/`.
 
 Run the package typecheck with:
 

package/package.json

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

package/plugins/index.ts

@@ -3,14 +3,19 @@ import * as path from "node:path";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
 import devinAuthPlugin from "./devin-auth/extensions/index.ts";
-import emberPlugin from "./ember/index.ts";
-import subagentPlugin from "./subagent/extensions/index.ts";
+import piCompactToolsPlugin from "./pi-compact-tools/index.ts";
+import piCustomAgentsPlugin, {
+	type PiCustomAgentsOptions,
+} from "./pi-custom-agents/index.ts";
 
-type PluginId = "ember" | "subagent" | "devin-auth";
+type PluginId = "pi-compact-tools" | "pi-custom-agents" | "devin-auth";
 type StackPlugin = {
 	id: PluginId;
 	description: string;
-	extension: (pi: ExtensionAPI) => void | Promise<void>;
+	extension: (
+		pi: ExtensionAPI,
+		options?: PiCustomAgentsOptions,
+	) => void | Promise<void>;
 };
 
 type StackPluginConfig = {
@@ -19,21 +24,21 @@ type StackPluginConfig = {
 
 const CONFIG_RELATIVE_PATH = path.join(".pi", "ember-stack.json");
 const DEFAULT_PLUGIN_IDS: readonly PluginId[] = [
-	"ember",
-	"subagent",
+	"pi-compact-tools",
+	"pi-custom-agents",
 	"devin-auth",
 ];
 
 const PLUGINS: readonly StackPlugin[] = [
 	{
-		id: "ember",
-		description: "Ember modes, questionnaire, footer, and compact edit rendering",
-		extension: emberPlugin,
+		id: "pi-compact-tools",
+		description: "Collapsed native edit rendering and questionnaire UI",
+		extension: piCompactToolsPlugin,
 	},
 	{
-		id: "subagent",
-		description: "Bundled subagent tool and agent definitions",
-		extension: subagentPlugin,
+		id: "pi-custom-agents",
+		description: "Primary modes, plans, subagents, and bundled agent definitions",
+		extension: piCustomAgentsPlugin,
 	},
 	{
 		id: "devin-auth",
@@ -130,9 +135,12 @@ 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);
+		await plugin.extension(pi, pluginOptions);
 	}
 	registerPluginCommand(pi, cwd, enabledPlugins);
 }

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

@@ -0,0 +1,74 @@
+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";
+
+const SOURCE_ROOT = path.dirname(fileURLToPath(import.meta.url));
+
+function registerCollapsedEditTool(extensionApi: any): void {
+	const editDefinition = createEditTool(SOURCE_ROOT);
+	extensionApi.registerTool({
+		name: "edit",
+		label: "edit",
+		description: editDefinition.description,
+		parameters: editDefinition.parameters,
+		renderShell: "self",
+
+		async execute(
+			toolCallId: string,
+			params: any,
+			signal: AbortSignal,
+			onUpdate: any,
+			ctx: any,
+		) {
+			return createEditTool(ctx.cwd).execute(
+				toolCallId,
+				params,
+				signal,
+				onUpdate,
+			);
+		},
+
+		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,
+			);
+		},
+
+		renderResult(result: any, { isPartial }: any, theme: any): any {
+			if (isPartial) return new Text(theme.fg("warning", "Editing..."), 0, 0);
+
+			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);
+			}
+
+			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 new Text(
+				theme.fg("success", `+${additions}`) +
+					theme.fg("dim", " / ") +
+					theme.fg("error", `-${removals}`),
+				0,
+				0,
+			);
+		},
+	});
+}
+
+export default function piCompactToolsPlugin(pi: any): void {
+	registerQuestionnaireTool(pi);
+	registerCollapsedEditTool(pi);
+}

package/plugins/{ember → pi-custom-agents}/index.ts

@@ -1,5 +1,5 @@
 /**
- * Pi Ember Stack — Primary Modes Extension
+ * Pi Custom Agents — Primary Modes Extension
  *
  * Toggleable primary modes for the Ember project, mirroring opencode's
  * mode: primary agents. Each mode is a slash command that:
@@ -20,13 +20,12 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import { isAbsolute, relative, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
-import { createEditTool } from "@earendil-works/pi-coding-agent";
-import { Text, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import {
 	askQuestionnaire,
-	registerQuestionnaireTool,
 	type QuestionnaireQuestion,
-} from "./questionnaire-tool.ts";
+} from "../pi-compact-tools/questionnaire-tool.ts";
+import subagentPlugin from "./subagent/extensions/index.ts";
 
 function formatTokens(count: number): string {
 	if (count < 1000) return count.toString();
@@ -52,8 +51,8 @@ const FULL_TOOLS = ["read", "bash", "edit", "write", "grep", "find", "ls", "ques
 
 const SOURCE_ROOT = path.dirname(fileURLToPath(import.meta.url));
 const SUBAGENT_FILES: Record<string, string> = {
-	coder: path.join(SOURCE_ROOT, "..", "subagent", "agents", "coder.md"),
-	architect: path.join(SOURCE_ROOT, "..", "subagent", "agents", "architect.md"),
+	coder: path.join(SOURCE_ROOT, "subagent", "agents", "coder.md"),
+	architect: path.join(SOURCE_ROOT, "subagent", "agents", "architect.md"),
 };
 
 interface ModeConfig {
@@ -559,73 +558,21 @@ function getLastModeFromSession(ctx: any): string | null {
 	return null;
 }
 
-export default function piEmberStackExtension(pi: any) {
+export type PiCustomAgentsOptions = {
+	compactToolsEnabled: boolean;
+};
+
+export default async function piCustomAgentsPlugin(
+	pi: any,
+	options: PiCustomAgentsOptions = { compactToolsEnabled: true },
+) {
 	let currentMode: string = DEFAULT_MODE;
 	let lastMessagedMode: string | null = null;
 	let waitingForPlan = false;
-	registerQuestionnaireTool(pi);
-	registerCollapsedEditTool(pi);
-
-	function registerCollapsedEditTool(extensionApi: any): void {
-		const editDefinition = createEditTool(SOURCE_ROOT);
-		extensionApi.registerTool({
-			name: "edit",
-			label: "edit",
-			description: editDefinition.description,
-			parameters: editDefinition.parameters,
-			renderShell: "self",
-
-			async execute(
-				toolCallId: string,
-				params: any,
-				signal: AbortSignal,
-				onUpdate: any,
-				ctx: any,
-			) {
-				return createEditTool(ctx.cwd).execute(
-					toolCallId,
-					params,
-					signal,
-					onUpdate,
-				);
-			},
-
-			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,
-				);
-			},
-
-			renderResult(result: any, { isPartial }: any, theme: any): any {
-				if (isPartial) return new Text(theme.fg("warning", "Editing..."), 0, 0);
-
-				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);
-				}
-
-				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 new Text(
-					theme.fg("success", `+${additions}`) +
-						theme.fg("dim", " / ") +
-						theme.fg("error", `-${removals}`),
-					0,
-					0,
-				);
-			},
-		});
-	}
+	const compactToolsEnabled = options.compactToolsEnabled;
+	const toolsForMode = (tools: string[]): string[] => compactToolsEnabled
+		? tools
+		: tools.filter((toolName) => toolName !== "questionnaire");
 
 	for (const modeId of MODE_IDS) {
 		const mode = MODES[modeId];
@@ -655,11 +602,11 @@ export default function piEmberStackExtension(pi: any) {
 		const mode = MODES[modeId];
 		if (!mode) return;
 		currentMode = modeId;
-		pi.setActiveTools(mode.tools);
+		pi.setActiveTools(toolsForMode(mode.tools));
 		if (modeId === DEFAULT_MODE) {
 			ctx.ui.notify("Coder mode. Full access restored.");
 		} else {
-			ctx.ui.notify(`${mode.label} mode enabled. Tools: ${mode.tools.join(", ")}`);
+			ctx.ui.notify(`${mode.label} mode enabled. Tools: ${toolsForMode(mode.tools).join(", ")}`);
 		}
 		updateStatus(ctx);
 	}
@@ -956,11 +903,11 @@ export default function piEmberStackExtension(pi: any) {
 		if (restored && restored !== DEFAULT_MODE) {
 			currentMode = restored;
 			lastMessagedMode = restored;
-			pi.setActiveTools(MODES[restored].tools);
+			pi.setActiveTools(toolsForMode(MODES[restored].tools));
 		} else {
 			currentMode = DEFAULT_MODE;
 			lastMessagedMode = null;
-			pi.setActiveTools(FULL_TOOLS);
+			pi.setActiveTools(toolsForMode(FULL_TOOLS));
 		}
 		installCustomFooter(ctx);
 		updateStatus(ctx);
@@ -971,13 +918,15 @@ export default function piEmberStackExtension(pi: any) {
 		if (restored && restored !== DEFAULT_MODE) {
 			currentMode = restored;
 			lastMessagedMode = restored;
-			pi.setActiveTools(MODES[restored].tools);
+			pi.setActiveTools(toolsForMode(MODES[restored].tools));
 		} else {
 			currentMode = DEFAULT_MODE;
 			lastMessagedMode = null;
-			pi.setActiveTools(FULL_TOOLS);
+			pi.setActiveTools(toolsForMode(FULL_TOOLS));
 		}
 		updateStatus(ctx);
 		installCustomFooter(ctx);
 	});
+
+	await subagentPlugin(pi);
 }