@nmzpy/pi-ember-stack 0.1.5 → 0.2.1

package/README.md

@@ -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.5"
+"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,7 +1,7 @@
 {
   "name": "@nmzpy/pi-ember-stack",
-  "version": "0.1.5",
-  "description": "Ember's configurable pi plugin stack with modes, questionnaire, compact edits, subagents, and Devin auth",
+  "version": "0.2.1",
+  "description": "Ember's configurable pi plugin stack with modes, questionnaire, compact edits, subagents, and Devin auth",
   "type": "module",
   "license": "MIT",
   "keywords": [
@@ -25,11 +25,19 @@
     "tsconfig.json",
     "plugins"
   ],
+  "exports": {
+    ".": "./plugins/index.ts",
+    "./renderer": "./plugins/pi-compact-tools/renderer.ts"
+  },
   "pi": {
     "extensions": [
       "./plugins/index.ts"
     ]
   },
+  "dependencies": {
+    "@ff-labs/fff-node": "0.9.6",
+    "@sinclair/typebox": "^0.34.0"
+  },
   "peerDependencies": {
     "@earendil-works/pi-ai": "*",
     "@earendil-works/pi-agent-core": "*",
@@ -42,6 +50,8 @@
     "@earendil-works/pi-agent-core": "^0.80.6",
     "@earendil-works/pi-coding-agent": "^0.80.6",
     "@earendil-works/pi-tui": "^0.80.6",
+    "@ff-labs/fff-node": "0.9.6",
+    "@sinclair/typebox": "^0.34.0",
     "@types/node": "^20.19.43",
     "typebox": "^1.3.1",
     "typescript": "^5.9.3"

package/plugins/devin-auth/extensions/index.ts

@@ -5,7 +5,7 @@
  *  - OAuth login via Windsurf's browser sign-in flow (`loginDevin`)
  *  - A no-op token refresh (Windsurf api_keys are long-lived)
  *  - Live model catalog fetch from Cognition's GetCascadeModelConfigs
- *    after login, filtered to 11 wanted model families
+ *    after login, surfacing every model the account has access to
  *  - `/devin-refresh` command to manually re-fetch the catalog
  *  - `/devin-status` command to check auth state
  *  - `session_start` auto-fetch when already logged in
@@ -15,7 +15,8 @@
  * and auth are handled internally via the OAuth-issued api_key.
  */
 
-import type { ExtensionAPI } from '@earendil-works/pi-coding-agent';
+import type { ExtensionAPI, ProviderModelConfig } from '@earendil-works/pi-coding-agent';
+import { AuthStorage } from '@earendil-works/pi-coding-agent';
 import type {
     Api,
     Model,
@@ -24,7 +25,7 @@ import type {
 } from '@earendil-works/pi-ai';
 import { streamDevin } from '../src/stream.js';
 import { loginDevin } from '../src/oauth/login.js';
-import { buildLiveModels, FALLBACK_MODELS, DEFAULT_HOST } from '../src/models.js';
+import { buildLiveModels, DEFAULT_HOST } from '../src/models.js';
 import { getCachedCatalog, clearCachedCatalog } from '../src/cloud-direct/catalog.js';
 import { DEFAULT_REGION } from '../src/oauth/types.js';
 
@@ -38,7 +39,34 @@ const PLACEHOLDER_BASE_URL = DEFAULT_HOST;
 
 let _pi: ExtensionAPI | null = null;
 
-function registerDevinProvider(pi: ExtensionAPI, models: typeof FALLBACK_MODELS): void {
+/**
+ * Fetch the live catalog using credentials already in auth.json and register
+ * the resulting models. Called during the awaited factory load so devin
+ * models exist before pi flushes pending provider registrations and restores
+ * the session model.
+ *
+ * Reads auth.json directly via AuthStorage (the model registry is not bound
+ * yet during factory load). Silently no-ops when not signed in or the fetch
+ * fails — the session_start handler re-attempts once the registry is live.
+ */
+async function primeCatalogFromStoredAuth(): Promise<void> {
+    if (!_pi) return;
+    try {
+        const authStorage = AuthStorage.create();
+        const apiKey = await authStorage.getApiKey(PROVIDER_ID, { includeFallback: false });
+        if (!apiKey) return;
+        const catalog = await getCachedCatalog(apiKey, DEFAULT_HOST);
+        const liveModels = buildLiveModels(catalog);
+        if (liveModels.length > 0) {
+            registerDevinProvider(_pi, liveModels);
+        }
+    } catch {
+        // Not signed in, network failure, or schema drift — keep the empty
+        // model list and let session_start retry once the registry is bound.
+    }
+}
+
+function registerDevinProvider(pi: ExtensionAPI, models: ProviderModelConfig[]): void {
     pi.registerProvider(PROVIDER_ID, {
         name: PROVIDER_NAME,
         api: API_IDENTIFIER,
@@ -58,7 +86,7 @@ function registerDevinProvider(pi: ExtensionAPI, models: typeof FALLBACK_MODELS)
                         const liveModels = buildLiveModels(catalog);
                         registerDevinProvider(_pi, liveModels);
                     } catch {
-                        // keep static models if catalog fetch fails
+                        // keep current models if catalog fetch fails
                     }
                 }
                 return credentials;
@@ -80,9 +108,19 @@ function registerDevinProvider(pi: ExtensionAPI, models: typeof FALLBACK_MODELS)
 export default async function (pi: ExtensionAPI): Promise<void> {
     _pi = pi;
 
-    registerDevinProvider(pi, FALLBACK_MODELS);
+    // Register with an empty model list first so the provider (and OAuth
+    // login support) is known even before the catalog arrives. Then, if we
+    // already have credentials in auth.json, fetch the live catalog now —
+    // during the awaited factory load, before pi flushes pending provider
+    // registrations and restores the session model. This is what makes
+    // `devin/glm-5-2` resolvable on resume instead of falling back to the
+    // default provider with a "Could not restore model" warning.
+    registerDevinProvider(pi, []);
+    await primeCatalogFromStoredAuth();
 
     pi.on('session_start', async (_event, ctx) => {
+        // Re-prime in case credentials were added via /login since load, or
+        // the catalog TTL expired during a long-lived session.
         try {
             const apiKey = await ctx.modelRegistry.getApiKeyForProvider(PROVIDER_ID);
             if (apiKey && _pi) {
@@ -91,7 +129,7 @@ export default async function (pi: ExtensionAPI): Promise<void> {
                 registerDevinProvider(_pi, liveModels);
             }
         } catch {
-            // keep static models
+            // keep current models
         }
     });
 

package/plugins/devin-auth/src/models.ts

@@ -1,18 +1,13 @@
 /**
  * Model list for the Devin (Cognition) provider.
  *
- * Two paths:
- *   1. {@link FALLBACK_MODELS} — 11 static entries shown before login or
- *      when the live catalog fetch fails. Carries real pricing.
- *   2. {@link buildLiveModels} — filters the live `GetCascadeModelConfigs`
- *      catalog to the 11 model families we care about, stamping each entry
- *      with pricing/metadata from {@link MODEL_OVERRIDES}.
+ * Fully live-catalog driven. {@link buildLiveModels} pulls every model from
+ * Cognition's `GetCascadeModelConfigs` catalog and surfaces it directly —
+ * no hardcoded family list, no hardcoded pricing/metadata. The catalog's
+ * `label` is used as the display name (with optional overrides below).
  *
- * The catalog only carries `modelUid`, `label`, and `disabled` — it does
- * NOT include context window, max output tokens, reasoning capability, or
- * pricing. We supply all of those from {@link MODEL_OVERRIDES}, keyed by
- * prefix so variants (e.g. `claude-opus-4-8-medium`, `gpt-5-6-sol-low`)
- * inherit the correct metadata from their parent family.
+ * Before login (or if the catalog fetch fails) we return an empty list so
+ * pi shows no models until the live catalog arrives.
  */
 
 import type { ProviderModelConfig } from '@earendil-works/pi-coding-agent';
@@ -22,212 +17,63 @@ import type { CacheEntry } from './cloud-direct/index.js';
 const DEFAULT_HOST = 'https://server.codeium.com';
 
 /**
- * Prefixes of the 11 model families we want from the live catalog.
- * Prefix matching catches variants (e.g. `swe-1-7-lightning`,
- * `gpt-5-6-sol-low`, `claude-opus-4-8-high`).
- */
-export const WANTED_PREFIXES: readonly string[] = [
-    'swe-1-7',
-    'gpt-5-6-sol',
-    'gpt-5-6-luna',
-    'gpt-5-6-terra',
-    'claude-opus-4-8',
-    'claude-fable-5',
-    'claude-sonnet-5',
-    'glm-5-2',
-    'kimi-k2-7',
-    'grok-4-5',
-];
-
-function matchesWantedPrefix(uid: string): boolean {
-    for (const prefix of WANTED_PREFIXES) {
-        if (uid === prefix || uid.startsWith(prefix + '-') || uid.startsWith(prefix + '_')) {
-            return true;
-        }
-    }
-    return false;
-}
-
-/**
- * Per-model metadata + pricing, keyed by prefix.
+ * Per-family variant allow-list. If a family prefix is present, only UIDs
+ * whose suffix (the part after `prefix-`) is in the set are kept. A UID that
+ * exactly equals the prefix is always allowed (suffix = empty string).
  *
- * All prices are per million tokens (USD). Used by both
- * {@link FALLBACK_MODELS} and {@link buildLiveModels} so there is a single
- * source of truth for pricing.
+ * Families not listed here keep all variants.
  */
-interface ModelMeta {
-    contextWindow: number;
-    maxTokens: number;
-    reasoning: boolean;
-    input: ('text' | 'image')[];
-    cost: {
-        input: number;
-        output: number;
-        cacheRead: number;
-        cacheWrite: number;
-    };
-}
-
-const MODEL_META: Map<string, ModelMeta> = new Map([
-    ['swe-1-7', {
-        contextWindow: 256_000,
-        maxTokens: 128_000,
-        reasoning: true,
-        input: ['text', 'image'],
-        cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-    }],
-    ['swe-1-7-lightning', {
-        contextWindow: 256_000,
-        maxTokens: 128_000,
-        reasoning: true,
-        input: ['text', 'image'],
-        cost: { input: 2.50, output: 12.50, cacheRead: 0.25, cacheWrite: 3.13 },
-    }],
-    ['gpt-5-6-sol', {
-        contextWindow: 1_050_000,
-        maxTokens: 128_000,
-        reasoning: true,
-        input: ['text', 'image'],
-        cost: { input: 5.00, output: 30.00, cacheRead: 0.50, cacheWrite: 6.25 },
-    }],
-    ['gpt-5-6-luna', {
-        contextWindow: 1_050_000,
-        maxTokens: 128_000,
-        reasoning: true,
-        input: ['text', 'image'],
-        cost: { input: 1.00, output: 6.00, cacheRead: 0.10, cacheWrite: 1.25 },
-    }],
-    ['gpt-5-6-terra', {
-        contextWindow: 1_050_000,
-        maxTokens: 128_000,
-        reasoning: true,
-        input: ['text', 'image'],
-        cost: { input: 2.50, output: 15.00, cacheRead: 0.25, cacheWrite: 3.13 },
-    }],
-    ['claude-opus-4-8', {
-        contextWindow: 200_000,
-        maxTokens: 128_000,
-        reasoning: true,
-        input: ['text', 'image'],
-        cost: { input: 5.00, output: 25.00, cacheRead: 0.50, cacheWrite: 6.25 },
-    }],
-    ['claude-fable-5', {
-        contextWindow: 1_000_000,
-        maxTokens: 128_000,
-        reasoning: true,
-        input: ['text', 'image'],
-        cost: { input: 10.00, output: 50.00, cacheRead: 1.00, cacheWrite: 12.50 },
-    }],
-    ['claude-sonnet-5', {
-        contextWindow: 200_000,
-        maxTokens: 64_000,
-        reasoning: true,
-        input: ['text', 'image'],
-        cost: { input: 3.00, output: 15.00, cacheRead: 0.30, cacheWrite: 3.75 },
-    }],
-    ['glm-5-2', {
-        contextWindow: 1_000_000,
-        maxTokens: 131_000,
-        reasoning: true,
-        input: ['text', 'image'],
-        cost: { input: 0.70, output: 2.20, cacheRead: 0.26, cacheWrite: 0.88 },
-    }],
-    ['kimi-k2-7', {
-        contextWindow: 256_000,
-        maxTokens: 256_000,
-        reasoning: true,
-        input: ['text', 'image'],
-        cost: { input: 0.95, output: 4.00, cacheRead: 0.19, cacheWrite: 1.19 },
-    }],
-    ['grok-4-5', {
-        contextWindow: 500_000,
-        maxTokens: 128_000,
-        reasoning: true,
-        input: ['text', 'image'],
-        cost: { input: 2.00, output: 6.00, cacheRead: 0.50, cacheWrite: 2.50 },
-    }],
+const VARIANT_ALLOW: Map<string, Set<string>> = new Map([
+    ['glm-5-2', new Set(['high', 'max'])],
 ]);
 
-/**
- * Find the best-matching metadata for a UID by longest-prefix match
- * against {@link MODEL_META}. This lets `swe-1-7-lightning` match the
- * `swe-1-7-lightning` entry (specific) and `gpt-5-6-sol-low` match the
- * `gpt-5-6-sol` entry (parent family).
- */
-function findMeta(uid: string): ModelMeta | undefined {
-    let best: { key: string; meta: ModelMeta } | null = null;
-    for (const [key, meta] of MODEL_META) {
-        if (uid === key || uid.startsWith(key + '-') || uid.startsWith(key + '_')) {
-            if (!best || key.length > best.key.length) {
-                best = { key, meta };
+function matchesVariantFilter(uid: string): boolean {
+    let bestPrefix: string | null = null;
+    for (const prefix of VARIANT_ALLOW.keys()) {
+        if (uid === prefix || uid.startsWith(prefix + '-') || uid.startsWith(prefix + '_')) {
+            if (bestPrefix === null || prefix.length > bestPrefix.length) {
+                bestPrefix = prefix;
             }
         }
     }
-    return best?.meta;
-}
-
-/** Conservative defaults for catalog UIDs not in the override table. */
-const DEFAULT_META: ModelMeta = {
-    contextWindow: 256_000,
-    maxTokens: 128_000,
-    reasoning: true,
-    input: ['text', 'image'],
-    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-};
-
-function makeModel(id: string, name: string, meta: ModelMeta): ProviderModelConfig {
-    return {
-        id,
-        name,
-        reasoning: meta.reasoning,
-        input: meta.input,
-        cost: meta.cost,
-        contextWindow: meta.contextWindow,
-        maxTokens: meta.maxTokens,
-    };
+    if (bestPrefix === null) return true;
+    if (uid === bestPrefix) return true;
+    const suffix = uid.slice(bestPrefix.length + 1);
+    return VARIANT_ALLOW.get(bestPrefix)!.has(suffix);
 }
 
-/**
- * Static fallback list — 11 models with real pricing.
- * Shown before login or when the live catalog fetch fails.
- */
-export const FALLBACK_MODELS: ProviderModelConfig[] = [
-    makeModel('swe-1-7', 'SWE-1.7', MODEL_META.get('swe-1-7')!),
-    makeModel('swe-1-7-lightning', 'SWE-1.7 Lightning', MODEL_META.get('swe-1-7-lightning')!),
-    makeModel('gpt-5-6-sol', 'GPT-5.6 Sol', MODEL_META.get('gpt-5-6-sol')!),
-    makeModel('gpt-5-6-luna', 'GPT-5.6 Luna', MODEL_META.get('gpt-5-6-luna')!),
-    makeModel('gpt-5-6-terra', 'GPT-5.6 Terra', MODEL_META.get('gpt-5-6-terra')!),
-    makeModel('claude-opus-4-8', 'Claude Opus 4.8', MODEL_META.get('claude-opus-4-8')!),
-    makeModel('claude-fable-5', 'Claude Fable 5', MODEL_META.get('claude-fable-5')!),
-    makeModel('claude-sonnet-5', 'Claude Sonnet 5', MODEL_META.get('claude-sonnet-5')!),
-    makeModel('glm-5-2', 'GLM-5.2', MODEL_META.get('glm-5-2')!),
-    makeModel('kimi-k2-7', 'Kimi K2.7', MODEL_META.get('kimi-k2-7')!),
-    makeModel('grok-4-5', 'Grok 4.5', MODEL_META.get('grok-4-5')!),
-];
+/** Display-name overrides for catalog UIDs whose live label is undesired. */
+const NAME_OVERRIDES = new Map<string, string>([
+    ['glm-5-2', 'GLM-5.2'],
+]);
 
 /**
  * Build the model list from a live catalog response.
  *
- * Filters to the 11 wanted families via {@link WANTED_PREFIXES}, skips
- * disabled entries, and stamps each with pricing/metadata from
- * {@link MODEL_META}. Falls back to {@link FALLBACK_MODELS} when the
- * catalog is null, empty, or contains none of our wanted models.
+ * Surfaces every non-disabled model the catalog returns, applying the variant
+ * filter and name overrides above. Returns an empty array before login or
+ * when the catalog fetch fails — pi will show no models until the live list
+ * arrives.
  */
 export function buildLiveModels(catalog: CacheEntry | null): ProviderModelConfig[] {
     if (!catalog || catalog.byUid.size === 0) {
-        return FALLBACK_MODELS;
+        return [];
     }
 
     const models: ProviderModelConfig[] = [];
     for (const entry of catalog.byUid.values()) {
         if (entry.disabled) continue;
-        if (!matchesWantedPrefix(entry.modelUid)) continue;
-        const meta = findMeta(entry.modelUid) ?? DEFAULT_META;
-        models.push(makeModel(entry.modelUid, entry.label || entry.modelUid, meta));
-    }
-
-    if (models.length === 0) {
-        return FALLBACK_MODELS;
+        if (!matchesVariantFilter(entry.modelUid)) continue;
+        const name = NAME_OVERRIDES.get(entry.modelUid) ?? entry.label ?? entry.modelUid;
+        models.push({
+            id: entry.modelUid,
+            name,
+            reasoning: true,
+            input: ['text', 'image'],
+            cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+            contextWindow: 256_000,
+            maxTokens: 128_000,
+        });
     }
 
     return models;

package/plugins/index.ts

@@ -3,10 +3,15 @@ import * as path from "node:path";
 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 piCompactToolsPlugin, { getSharedRenderer } from "./pi-compact-tools/index.ts";
 import piCustomAgentsPlugin from "./pi-custom-agents/index.ts";
+import piEmberFffPlugin from "./pi-ember-fff/index.ts";
+import piEmberTpsPlugin from "./pi-ember-tps/index.ts";
+import piEmberUiPlugin from "./pi-ember-ui/index.ts";
 
-type PluginId = "pi-compact-tools" | "pi-custom-agents" | "devin-auth";
+export { getSharedRenderer };
+
+type PluginId = "pi-compact-tools" | "pi-custom-agents" | "devin-auth" | "pi-ember-fff" | "pi-ember-ui" | "pi-ember-tps";
 type StackPlugin = {
 	id: PluginId;
 	description: string;
@@ -20,8 +25,11 @@ type StackPluginConfig = {
 const CONFIG_RELATIVE_PATH = path.join(".pi", "ember-stack.json");
 const DEFAULT_PLUGIN_IDS: readonly PluginId[] = [
 	"pi-compact-tools",
-	"pi-custom-agents",
 	"devin-auth",
+	"pi-custom-agents",
+	"pi-ember-fff",
+	"pi-ember-ui",
+	"pi-ember-tps",
 ];
 
 const PLUGINS: readonly StackPlugin[] = [
@@ -30,15 +38,30 @@ const PLUGINS: readonly StackPlugin[] = [
 		description: "Collapsed native edit rendering",
 		extension: piCompactToolsPlugin,
 	},
+	{
+		id: "devin-auth",
+		description: "Devin OAuth provider, model catalog, and streaming transport",
+		extension: devinAuthPlugin,
+	},
 	{
 		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,
 	},
 	{
-		id: "devin-auth",
-		description: "Devin OAuth provider, model catalog, and streaming transport",
-		extension: devinAuthPlugin,
+		id: "pi-ember-fff",
+		description: "FFF-powered grep and find with compact rendering",
+		extension: piEmberFffPlugin,
+	},
+	{
+		id: "pi-ember-ui",
+		description: "Ember accent theme — orange reasoning colors, accent borders",
+		extension: piEmberUiPlugin,
+	},
+	{
+		id: "pi-ember-tps",
+		description: "Tokens-per-second meter with sparkline trend and live gauge",
+		extension: piEmberTpsPlugin,
 	},
 ];
 

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

@@ -1,17 +1,49 @@
 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 {
+	createBashTool,
+	createEditTool,
+	createFindTool,
+	createGrepTool,
+	createLsTool,
+	createReadTool,
+	createWriteTool,
+	type ExtensionAPI,
+} from "@earendil-works/pi-coding-agent";
+import { type Component } from "@earendil-works/pi-tui";
+import {
+	CompactRenderer,
+	GROUPABLE_TOOLS,
+	type ToolRenderContext,
+	type ToolRenderResultOptions,
+} from "./renderer.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,
+type ToolFactory = (cwd: string) => any;
+
+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(
@@ -21,51 +53,40 @@ function registerCollapsedEditTool(extensionApi: any): void {
 			onUpdate: any,
 			ctx: any,
 		) {
-			return createEditTool(ctx.cwd).execute(
-				toolCallId,
-				params,
-				signal,
-				onUpdate,
-			);
+			return factory(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,
-			);
+		renderCall(args: any, theme: any, context: ToolRenderContext): Component {
+			return renderer.renderCall(name, args, theme, context);
 		},
 
-		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,
-			);
+		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 {
-	registerCollapsedEditTool(pi);
+let sharedRenderer: CompactRenderer | null = null;
+
+export function getSharedRenderer(): CompactRenderer {
+	if (!sharedRenderer) sharedRenderer = new CompactRenderer();
+	return sharedRenderer;
+}
+
+export default function piCompactToolsPlugin(pi: ExtensionAPI): void {
+	const renderer = getSharedRenderer();
+	pi.on("turn_start", () => renderer.beginTurn());
+	pi.on("tool_call", (event: any) => {
+		if (GROUPABLE_TOOLS.has(event.toolName) || 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);
+	}
 }