@nmzpy/pi-ember-stack 0.1.6 → 0.2.2

package/plugins/devin-auth/src/oauth/types.ts

@@ -1,71 +1,71 @@
-/**
- * Shared types for the OAuth login flow + persisted credentials.
- *
- * Two distinct token shapes appear in this codebase:
- *
- *  - `firebaseIdToken` — the short-lived JWT minted by Auth0 / Firebase Auth
- *    during browser sign-in. Lives in the OAuth callback URL fragment/query.
- *    Treated as opaque and discarded once exchanged.
- *
- *  - `apiKey` — the long-lived credential returned by
- *    `SeatManagementService.RegisterUser`. Used inside every Cascade RPC's
- *    `Metadata.api_key` field. Format is provider-defined:
- *      * Cognition era:  `devin-session-token$<JWT>`
- *      * Codeium classic: bare UUID v4
- *      * Older Windsurf:  `sk-ws-01-<...>` / `cog_<...>`
- *    The plugin treats it as an opaque string — only the cloud cares about format.
- */
-
-export interface OAuthLoginResult {
-  /** The opaque API key used as `Metadata.api_key` in every Cascade RPC. */
-  apiKey: string;
-  /** Human-readable account name (`Satvik Kapoor`). */
-  name: string;
-  /**
-   * Cloud API server (`https://server.codeium.com`, `https://eu.windsurf.com/_route/api_server`,
-   * `https://windsurf.fedstart.com/_route/api_server`). Driven by the user's
-   * tenant — language_server needs this as `--api_server_url`.
-   */
-  apiServerUrl: string;
-  /** Optional cleanup redirect URL returned by RegisterUser. Informational. */
-  redirectUrl?: string;
-}
-
-export interface PersistedCredentials extends OAuthLoginResult {
-  /** ISO timestamp the credentials were minted at — purely informational. */
-  issuedAt: string;
-  /** Optional tag tracking the OAuth client id used (so a future client rotation can invalidate). */
-  oauthClientId: string;
-  /**
-   * True when these credentials were written as part of the
-   * `opencode auth login` → authorize() flow (so opencode's auth.json is the
-   * authoritative copy and `opencode auth logout windsurf` should mirror-clear
-   * this file). False / absent for credentials written by our standalone
-   * `opencode-windsurf-auth login` CLI; those survive opencode auth state
-   * changes.
-   */
-  syncedViaOpencodeAuth?: boolean;
-}
-
-export interface WindsurfRegion {
-  /** Where to send users for browser sign-in. */
-  website: string;
-  /** Where to POST RegisterUser. */
-  registerApiServerUrl: string;
-  /** Auth0 client id passed in the OAuth URL. */
-  oauthClientId: string;
-}
-
-/**
- * The single tenant (free / personal) configuration. EU, FedStart, and arbitrary
- * portal URLs override `website` + `registerApiServerUrl` at runtime when the
- * user passes `--portal-url` to the login command.
- */
-export const DEFAULT_REGION: WindsurfRegion = {
-  website: 'https://windsurf.com',
-  registerApiServerUrl: 'https://register.windsurf.com',
-  // From /Applications/Windsurf.app/.../extension.js — the public Windsurf
-  // Auth0 client. If Windsurf rotates this, sign-in will start failing until
-  // we re-extract it.
-  oauthClientId: '3GUryQ7ldAeKEuD2obYnppsnmj58eP5u',
-};
+/**
+ * Shared types for the OAuth login flow + persisted credentials.
+ *
+ * Two distinct token shapes appear in this codebase:
+ *
+ *  - `firebaseIdToken` — the short-lived JWT minted by Auth0 / Firebase Auth
+ *    during browser sign-in. Lives in the OAuth callback URL fragment/query.
+ *    Treated as opaque and discarded once exchanged.
+ *
+ *  - `apiKey` — the long-lived credential returned by
+ *    `SeatManagementService.RegisterUser`. Used inside every Cascade RPC's
+ *    `Metadata.api_key` field. Format is provider-defined:
+ *      * Cognition era:  `devin-session-token$<JWT>`
+ *      * Codeium classic: bare UUID v4
+ *      * Older Windsurf:  `sk-ws-01-<...>` / `cog_<...>`
+ *    The plugin treats it as an opaque string — only the cloud cares about format.
+ */
+
+export interface OAuthLoginResult {
+  /** The opaque API key used as `Metadata.api_key` in every Cascade RPC. */
+  apiKey: string;
+  /** Human-readable account name (`Satvik Kapoor`). */
+  name: string;
+  /**
+   * Cloud API server (`https://server.codeium.com`, `https://eu.windsurf.com/_route/api_server`,
+   * `https://windsurf.fedstart.com/_route/api_server`). Driven by the user's
+   * tenant — language_server needs this as `--api_server_url`.
+   */
+  apiServerUrl: string;
+  /** Optional cleanup redirect URL returned by RegisterUser. Informational. */
+  redirectUrl?: string;
+}
+
+export interface PersistedCredentials extends OAuthLoginResult {
+  /** ISO timestamp the credentials were minted at — purely informational. */
+  issuedAt: string;
+  /** Optional tag tracking the OAuth client id used (so a future client rotation can invalidate). */
+  oauthClientId: string;
+  /**
+   * True when these credentials were written as part of the
+   * `opencode auth login` → authorize() flow (so opencode's auth.json is the
+   * authoritative copy and `opencode auth logout windsurf` should mirror-clear
+   * this file). False / absent for credentials written by our standalone
+   * `opencode-windsurf-auth login` CLI; those survive opencode auth state
+   * changes.
+   */
+  syncedViaOpencodeAuth?: boolean;
+}
+
+export interface WindsurfRegion {
+  /** Where to send users for browser sign-in. */
+  website: string;
+  /** Where to POST RegisterUser. */
+  registerApiServerUrl: string;
+  /** Auth0 client id passed in the OAuth URL. */
+  oauthClientId: string;
+}
+
+/**
+ * The single tenant (free / personal) configuration. EU, FedStart, and arbitrary
+ * portal URLs override `website` + `registerApiServerUrl` at runtime when the
+ * user passes `--portal-url` to the login command.
+ */
+export const DEFAULT_REGION: WindsurfRegion = {
+  website: 'https://windsurf.com',
+  registerApiServerUrl: 'https://register.windsurf.com',
+  // From /Applications/Windsurf.app/.../extension.js — the public Windsurf
+  // Auth0 client. If Windsurf rotates this, sign-in will start failing until
+  // we re-extract it.
+  oauthClientId: '3GUryQ7ldAeKEuD2obYnppsnmj58eP5u',
+};

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

@@ -265,7 +265,7 @@ export function streamDevin(
                     output.usage.cacheRead = ev.cachedInputTokens ?? 0;
                     output.usage.cacheWrite = ev.cacheCreationInputTokens ?? 0;
                     output.usage.totalTokens =
-                        ev.totalTokens ?? output.usage.input + output.usage.output;
+                        output.usage.input + output.usage.output + output.usage.cacheRead + output.usage.cacheWrite;
                     // calculateCost mutates output.usage.cost in place.
                     calculateCost(model, output.usage);
                     break;

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: "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

@@ -10,199 +10,18 @@ import {
 	createWriteTool,
 	type ExtensionAPI,
 } from "@earendil-works/pi-coding-agent";
-import { Text, type Component } from "@earendil-works/pi-tui";
+import { type Component } from "@earendil-works/pi-tui";
+import {
+	CompactRenderer,
+	GROUPABLE_TOOLS,
+	bashGrepInfo,
+	type ToolRenderContext,
+	type ToolRenderResultOptions,
+} from "./renderer.ts";
 
 const SOURCE_ROOT = path.dirname(fileURLToPath(import.meta.url));
-const BULLET = "• ";
-const DISCOVERY_TOOLS = new Set(["read", "grep", "find", "ls"]);
 
 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[];
-};
-
-function textValue(value: unknown, fallback = ""): string {
-	if (value === undefined || value === null) return fallback;
-	return String(value).replace(/[\r\n]+/g, " ");
-}
-
-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));
-	}
-}
-
-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;
-	}
-
-	setResult(record: CompactCall, result: any, isError: boolean): void {
-		record.isError = isError;
-		if (record.group) {
-			record.group.records[0]?.invalidate?.();
-		}
-	}
-
-	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", " / ") +
-					theme.fg("error", `-${removals}`),
-				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,
@@ -253,14 +72,38 @@ function registerCompactTool(
 	});
 }
 
+let sharedRenderer: CompactRenderer | null = null;
+
+export { bashGrepInfo };
+
+export function getSharedRenderer(): CompactRenderer {
+	if (!sharedRenderer) sharedRenderer = new CompactRenderer();
+	return sharedRenderer;
+}
+
 export default function piCompactToolsPlugin(pi: ExtensionAPI): void {
-	const renderer = new CompactRenderer();
+	const renderer = getSharedRenderer();
 	pi.on("turn_start", () => renderer.beginTurn());
+	pi.on("message_update", (event: any) => {
+		// When the model streams visible text (not just thinking tokens),
+		// mark the turn as having visible output so the next discovery
+		// call starts a fresh group instead of appending to the previous
+		// turn's group. Thinking-only turns keep grouping coherent.
+		const ev = event?.assistantMessageEvent;
+		if (ev && (ev.type === "text_start" || ev.type === "text_delta")) {
+			renderer.noteVisibleText();
+		}
+	});
 	pi.on("tool_call", (event: any) => {
-		if (TOOL_FACTORIES[event.toolName]) {
-			renderer.observeCall(event.toolName, event.toolCallId, event.input);
+		if (GROUPABLE_TOOLS.has(event.toolName) || TOOL_FACTORIES[event.toolName]) {
+			renderer.registerCall(event.toolName, event.toolCallId, event.input);
 		}
 	});
+	// Reset the shared renderer on session replacement so stale call rows
+	// from the previous session do not leak into the new one. The renderer
+	// is module-level (shared across sessions because jiti caches the
+	// module), so it must be explicitly cleared.
+	pi.on("session_start", () => renderer.resetForSession());
 	for (const [name, factory] of Object.entries(TOOL_FACTORIES)) {
 		registerCompactTool(pi, name, factory, renderer);
 	}