pi-compact-tools 0.6.3 → 0.7.8

package/extensions/compact-tools.ts

@@ -1,322 +1,350 @@
-import type {
-	AgentToolResult,
-	BashToolDetails,
-	BashToolInput,
-	ExtensionAPI,
-	ExtensionContext,
-	Theme,
-	ToolDefinition,
-	ToolRenderResultOptions,
-} from "@earendil-works/pi-coding-agent";
-import {
-	createBashToolDefinition,
-	createEditToolDefinition,
-	createFindToolDefinition,
-	createGrepToolDefinition,
-	createLsToolDefinition,
-	createPowerShellToolDefinition,
-	createReadToolDefinition,
-	createWriteToolDefinition,
-} from "@earendil-works/pi-coding-agent";
-import type { Component, Container } from "@earendil-works/pi-tui";
-import {
-	classifyCallStatus,
-	formatDurationMs,
-	normalizeLineEndings,
-	type RowStatus,
-} from "./compact-tools-core.ts";
-import { isFullscreenMode, loadConfig } from "./compact-tools-config.ts";
-import { classifyToggleInput } from "./compact-tools-input.ts";
-import {
-	formatResultLineSummary,
-	getArgumentDetails,
-	getCallDetails,
-	getFileOutput,
-	getTextResult,
-} from "./compact-tools-invocation.ts";
-import {
-	CachedContainer,
-	prefixedText,
-	renderArguments,
-	renderOutput,
-	renderToolCall,
-	styleMultiline,
-	wrapEditResult,
-} from "./compact-tools-layout.ts";
-import { ToolRuntime } from "./compact-tools-runtime.ts";
-import { ThinkingCycleController } from "./compact-tools-thinking.ts";
-import type {
-	BuiltInDefinition,
-	CompactToolName,
-	RenderContext,
-	RowState,
-	ShellToolName,
-	ToolArgs,
-} from "./compact-tools-types.ts";
-
-const runtime = new ToolRuntime();
-const registeredTools = new Set<CompactToolName>();
-let unsubscribeTerminalInput: (() => void) | undefined;
-
-function bindTerminalInput(ctx: ExtensionContext): void {
-	unsubscribeTerminalInput?.();
-	unsubscribeTerminalInput = ctx.ui.onTerminalInput((data) => {
-		const input = classifyToggleInput(data);
-		if (!input) return undefined;
-		if (input === "release") return { consume: true };
-		runtime.toggleTrackedRows();
-		return { consume: true };
-	});
-}
-
-function spinnerTone(frameIndex: number, frameCount: number): "muted" | "dim" | "border" {
-	if (frameCount < 3) return "muted";
-	const distanceFromCenter = Math.abs(frameIndex / (frameCount - 1) - 0.5) * 2;
-	if (distanceFromCenter < 0.34) return "border";
-	return distanceFromCenter < 0.75 ? "dim" : "muted";
-}
-
-function callStatus(ctx: RenderContext, state: RowState): RowStatus {
-	return classifyCallStatus(ctx.isError, ctx.executionStarted, state.endedAt !== undefined);
-}
-
-function renderIndicator(theme: Theme, state: RowState, status: RowStatus): string {
-	if (status === "error") return theme.fg("error", "●");
-	if (status === "success") return theme.fg("success", "●");
-	const frames = runtime.config.spinner.frames;
-	const frameIndex = state.frame ?? 0;
-	return theme.fg(spinnerTone(frameIndex, frames.length), frames[frameIndex] ?? frames[0] ?? "◐");
-}
-
-function formatDuration(state: RowState): string | undefined {
-	if (state.startedAt === undefined) return undefined;
-	return formatDurationMs((state.endedAt ?? Date.now()) - state.startedAt);
-}
-
-function renderControls(
-	theme: Theme,
-	state: RowState,
-	running: boolean,
-	isError: boolean,
-	lineSummary?: string,
-): Component {
-	const duration = running && !runtime.animatesRows ? undefined : formatDuration(state);
-	const status = running
-		? (duration ?? "Running")
-		: `${isError ? "Failed" : "Done"}${duration ? ` in ${duration}` : ""}`;
-	let details = theme.fg("borderAccent", status);
-	if (lineSummary && !running) details += theme.fg("borderAccent", ` (${lineSummary})`);
-	if (state.hasResult) {
-		const clickAction = state.expanded ? "to hide" : "for result";
-		details += theme.fg(
-			"borderAccent",
-			`, ${theme.italic("ctrl+o")} toggle all • ${theme.italic("click")} ${clickAction}`,
-		);
-	}
-	return prefixedText(details, theme.fg("border", " └─ "), "    ");
-}
-
-function renderCallTitle(name: string, theme: Theme, ctx: RenderContext, state: RowState): string {
-	return `${renderIndicator(theme, state, callStatus(ctx, state))} ${theme.fg("toolTitle", theme.bold(name))}`;
-}
-
-function renderFileCall(
-	definition: BuiltInDefinition,
-	args: ToolArgs,
-	theme: Theme,
-	ctx: RenderContext,
-): Container {
-	const name = definition.name as CompactToolName;
-	const state = runtime.syncRow(ctx, ctx.state.endedAt === undefined);
-	runtime.track(ctx, name, state);
-	runtime.syncExpansion(state, ctx.expanded, name);
-	const callDetails = getCallDetails(name, args);
-	const details = callDetails
-		? styleMultiline(callDetails, (line) => theme.fg("toolOutput", line))
-		: undefined;
-	const container = new CachedContainer();
-	container.addChild(renderToolCall(renderCallTitle(name, theme, ctx, state), details, theme));
-	const arguments_ = getArgumentDetails(name, args);
-	if (Object.keys(arguments_).length > 0) container.addChild(renderArguments(arguments_, theme));
-	return container;
-}
-
-function updateEditResult(
-	definition: BuiltInDefinition,
-	result: AgentToolResult<unknown>,
-	options: ToolRenderResultOptions,
-	theme: Theme,
-	ctx: RenderContext,
-	state: RowState,
-): void {
-	if (definition.name !== "edit" || !definition.renderResult) return;
-	state.originalResultComponent = definition.renderResult(
-		result,
-		{ ...options, expanded: state.expanded ?? false },
-		theme,
-		{ ...ctx, state: {}, lastComponent: state.originalResultComponent },
-	);
-}
-
-function appendFileResult(
-	container: Container,
-	definition: BuiltInDefinition,
-	state: RowState,
-	output: string,
-	theme: Theme,
-	isError: boolean,
-): void {
-	if (!state.expanded) return;
-	if (definition.name === "edit") {
-		if (state.originalResultComponent) container.addChild(wrapEditResult(state.originalResultComponent, theme));
-		return;
-	}
-	const component = renderOutput(output, theme, isError);
-	if (component) container.addChild(component);
-}
-
-function renderFileResult(
-	definition: BuiltInDefinition,
-	result: AgentToolResult<unknown>,
-	options: ToolRenderResultOptions,
-	theme: Theme,
-	ctx: RenderContext,
-): Container {
-	const name = definition.name as CompactToolName;
-	const state = runtime.syncRow(ctx, options.isPartial, !options.isPartial);
-	runtime.track(ctx, name, state);
-	const output = getFileOutput(name, ctx.args, result, ctx.isError);
-	runtime.setResultAvailable(state, name, name === "edit" || output.length > 0);
-	updateEditResult(definition, result, options, theme, ctx, state);
-	const container = new CachedContainer();
-	appendFileResult(container, definition, state, output, theme, ctx.isError);
-	if (!options.isPartial && !state.resultLineSummaryComputed) {
-		state.resultLineSummary = formatResultLineSummary(name, ctx.args, result, output);
-		state.resultLineSummaryComputed = true;
-	}
-	container.addChild(renderControls(theme, state, options.isPartial, ctx.isError, state.resultLineSummary));
-	return container;
-}
-
-function renderShellCall(
-	name: ShellToolName,
-	args: BashToolInput,
-	theme: Theme,
-	ctx: RenderContext<BashToolInput>,
-): Component {
-	const state = runtime.syncRow(ctx, ctx.state.endedAt === undefined);
-	runtime.track(ctx, name, state);
-	runtime.syncExpansion(state, ctx.expanded, name);
-	const command = normalizeLineEndings(args.command ?? "") || "…";
-	const details = styleMultiline(command, (line) => theme.fg("toolOutput", line));
-	return renderToolCall(renderCallTitle(name, theme, ctx, state), details, theme);
-}
-
-function renderShellResult(
-	name: ShellToolName,
-	result: AgentToolResult<BashToolDetails | undefined>,
-	options: ToolRenderResultOptions,
-	theme: Theme,
-	ctx: RenderContext<BashToolInput>,
-): Component {
-	const state = runtime.syncRow(ctx, options.isPartial, !options.isPartial);
-	runtime.track(ctx, name, state);
-	const output = getTextResult(result);
-	runtime.setResultAvailable(state, name, output.length > 0);
-	if (!options.isPartial && !state.resultLineSummaryComputed) {
-		state.resultLineSummary = formatResultLineSummary(name, ctx.args, result, output);
-		state.resultLineSummaryComputed = true;
-	}
-	if (!state.expanded) {
-		return renderControls(theme, state, options.isPartial, ctx.isError, state.resultLineSummary);
-	}
-	const container = new CachedContainer();
-	const component = renderOutput(output, theme, ctx.isError);
-	if (component) container.addChild(component);
-	container.addChild(renderControls(theme, state, options.isPartial, ctx.isError, state.resultLineSummary));
-	return container;
-}
-
-const toolFactories: Record<CompactToolName, (cwd: string) => BuiltInDefinition> = {
-	read: createReadToolDefinition,
-	write: createWriteToolDefinition,
-	edit: createEditToolDefinition,
-	bash: createBashToolDefinition,
-	powershell: createPowerShellToolDefinition,
-	grep: createGrepToolDefinition,
-	find: createFindToolDefinition,
-	ls: createLsToolDefinition,
-};
-
-function createBuiltInDefinition(name: CompactToolName, cwd: string): BuiltInDefinition {
-	return toolFactories[name](cwd);
-}
-
-function registerFileTool(pi: ExtensionAPI, definition: BuiltInDefinition): void {
-	pi.registerTool({
-		...definition,
-		execute: runtime.createTimedExecute(definition),
-		renderShell: "self",
-		renderCall: (args: ToolArgs, theme: Theme, ctx: RenderContext) => renderFileCall(definition, args, theme, ctx),
-		renderResult: (
-			result: AgentToolResult<unknown>,
-			options: ToolRenderResultOptions,
-			theme: Theme,
-			ctx: RenderContext,
-		) => renderFileResult(definition, result, options, theme, ctx),
-	} as ToolDefinition<any, any, RowState>);
-}
-
-function registerShellTool(pi: ExtensionAPI, definition: BuiltInDefinition): void {
-	const name = definition.name as ShellToolName;
-	pi.registerTool({
-		...definition,
-		execute: runtime.createTimedExecute(definition),
-		renderShell: "self",
-		renderCall: (args: BashToolInput, theme: Theme, ctx: RenderContext<BashToolInput>) =>
-			renderShellCall(name, args, theme, ctx),
-		renderResult: (
-			result: AgentToolResult<BashToolDetails | undefined>,
-			options: ToolRenderResultOptions,
-			theme: Theme,
-			ctx: RenderContext<BashToolInput>,
-		) => renderShellResult(name, result, options, theme, ctx),
-	} as ToolDefinition<any, BashToolDetails | undefined, RowState>);
-}
-
-function registerTools(pi: ExtensionAPI, cwd: string): void {
-	const enabledTools = new Set(runtime.config.tools);
-	for (const name of registeredTools) {
-		if (!enabledTools.has(name)) pi.registerTool(createBuiltInDefinition(name, cwd));
-	}
-	registeredTools.clear();
-	for (const name of runtime.config.tools) {
-		const definition = createBuiltInDefinition(name, cwd);
-		if (name === "bash" || name === "powershell") registerShellTool(pi, definition);
-		else registerFileTool(pi, definition);
-		registeredTools.add(name);
-	}
-}
-
-function configure(pi: ExtensionAPI, cwd?: string, projectTrusted = false): void {
-	runtime.configure(loadConfig(cwd, projectTrusted), isFullscreenMode());
-	registerTools(pi, cwd ?? process.cwd());
-}
-
-export default function compactTools(pi: ExtensionAPI): void {
-	const thinkingCycle = new ThinkingCycleController(pi);
-	configure(pi);
-	pi.on("session_start", (event, ctx) => {
-		if (event.reason !== "reload") runtime.clearTimings();
-		configure(pi, ctx.cwd, ctx.isProjectTrusted());
-		bindTerminalInput(ctx);
-		thinkingCycle.bind(ctx);
-	});
-	pi.on("resources_discover", (_event, ctx) => configure(pi, ctx.cwd, ctx.isProjectTrusted()));
-	pi.on("session_shutdown", (event) => {
-		thinkingCycle.dispose();
-		unsubscribeTerminalInput?.();
-		unsubscribeTerminalInput = undefined;
-		runtime.reset(event.reason !== "reload");
-	});
-}
+import type {
+	AgentToolResult,
+	BashToolDetails,
+	BashToolInput,
+	ExtensionAPI,
+	Theme,
+	ToolDefinition,
+	ToolRenderResultOptions,
+} from "@earendil-works/pi-coding-agent";
+import {
+	createBashToolDefinition,
+	createEditToolDefinition,
+	createFindToolDefinition,
+	createGrepToolDefinition,
+	createLsToolDefinition,
+	createPowerShellToolDefinition,
+	createReadToolDefinition,
+	createWriteToolDefinition,
+} from "@earendil-works/pi-coding-agent";
+import type { Component, Container } from "@earendil-works/pi-tui";
+import {
+	classifyCallStatus,
+	formatDurationMs,
+	indicatorGlyph,
+	indicatorStrength,
+	indicatorTone,
+	normalizeLineEndings,
+	type RowStatus,
+} from "./compact-tools-core.ts";
+import { colorizeRgb, interpolateRgb, themeColorRgb } from "./compact-tools-color.ts";
+import { loadConfig } from "./compact-tools-config.ts";
+import {
+	formatResultLineSummary,
+	getArgumentDetails,
+	getCallDetails,
+	getEditChanges,
+	getFileOutput,
+	getTextResult,
+	summarizeShellCommand,
+} from "./compact-tools-invocation.ts";
+import {
+	CachedContainer,
+	limitComponentLines,
+	prefixedText,
+	renderArguments,
+	renderEditChanges,
+	renderOutput,
+	renderToolCall,
+	styleMultiline,
+} from "./compact-tools-layout.ts";
+import { ProgressController } from "./compact-tools-progress.ts";
+import { ToolRuntime } from "./compact-tools-runtime.ts";
+import { ThinkingCycleController } from "./compact-tools-thinking.ts";
+import type {
+	BuiltInDefinition,
+	CompactToolName,
+	RenderContext,
+	RowState,
+	ShellToolName,
+	ToolArgs,
+} from "./compact-tools-types.ts";
+
+const runtime = new ToolRuntime();
+const registeredTools = new Set<CompactToolName>();
+let registeredConfiguration: string | undefined;
+
+function callStatus(ctx: RenderContext, state: RowState): RowStatus {
+	// write/edit arguments can stream for much longer than their eventual filesystem
+	// operation. Treat that active tool-call phase as running so every built-in row
+	// animates consistently instead of waiting for execute() to begin.
+	const active = ctx.executionStarted || !ctx.argsComplete;
+	return classifyCallStatus(ctx.isError, active, state.endedAt !== undefined);
+}
+
+function renderIndicator(theme: Theme, ctx: RenderContext, status: RowStatus): string {
+	const frame = runtime.syncIndicator(ctx.toolCallId, status === "running", () => ctx.invalidate());
+	const glyph = indicatorGlyph(status, frame);
+	if (status === "running") {
+		const bright = themeColorRgb(theme, "borderAccent");
+		const dim = themeColorRgb(theme, "borderMuted");
+		if (bright && dim) {
+			return colorizeRgb(theme, interpolateRgb(dim, bright, indicatorStrength(status, frame)), glyph);
+		}
+	}
+	return theme.fg(indicatorTone(status, frame), glyph);
+}
+
+function formatDuration(state: RowState): string | undefined {
+	if (state.startedAt === undefined) return undefined;
+	return formatDurationMs((state.endedAt ?? Date.now()) - state.startedAt);
+}
+
+function canReuseResult<TDetails, TArgs>(
+	state: RowState,
+	result: AgentToolResult<TDetails>,
+	options: ToolRenderResultOptions,
+	ctx: RenderContext<TArgs>,
+): ctx is RenderContext<TArgs> & { lastComponent: Component } {
+	return ctx.lastComponent !== undefined
+		&& state.lastResultContent === result.content
+		&& state.lastResultDetails === result.details
+		&& state.lastResultPartial === options.isPartial
+		&& state.lastResultExpanded === state.expanded
+		&& state.lastResultPreview === state.preview
+		&& state.lastResultError === ctx.isError
+		&& state.lastResultConfigRevision === state.configRevision;
+}
+
+function rememberResult<TDetails, TArgs>(
+	state: RowState,
+	result: AgentToolResult<TDetails>,
+	options: ToolRenderResultOptions,
+	ctx: RenderContext<TArgs>,
+): void {
+	state.lastResultContent = result.content;
+	state.lastResultDetails = result.details;
+	state.lastResultPartial = options.isPartial;
+	state.lastResultExpanded = state.expanded;
+	state.lastResultPreview = state.preview;
+	state.lastResultError = ctx.isError;
+	state.lastResultConfigRevision = state.configRevision;
+}
+
+function renderControls(
+	theme: Theme,
+	state: RowState,
+	running: boolean,
+	isError: boolean,
+	lineSummary?: string,
+): Component {
+	const duration = running ? undefined : formatDuration(state);
+	const status = running
+		? (duration ?? "Running")
+		: `${isError ? "Failed" : "Done"}${duration ? ` in ${duration}` : ""}`;
+	let details = theme.fg("borderAccent", status);
+	if (lineSummary && !running) details += theme.fg("borderAccent", ` (${lineSummary})`);
+	return prefixedText(details, theme.fg("border", " └─ "), "    ");
+}
+
+function renderCallTitle(name: string, theme: Theme, ctx: RenderContext, state: RowState): string {
+	return `${renderIndicator(theme, ctx, callStatus(ctx, state))} ${theme.fg("toolTitle", theme.bold(name))}`;
+}
+
+function renderFileCall(
+	definition: BuiltInDefinition,
+	args: ToolArgs,
+	theme: Theme,
+	ctx: RenderContext,
+): Container {
+	const name = definition.name as CompactToolName;
+	const state = runtime.syncRow(ctx, ctx.state.endedAt === undefined);
+	runtime.syncExpansion(state, ctx.expanded, name);
+	const callDetails = getCallDetails(name, args);
+	const details = callDetails
+		? styleMultiline(callDetails, (line) => theme.fg("toolOutput", line))
+		: undefined;
+	const container = new CachedContainer();
+	container.addChild(renderToolCall(renderCallTitle(name, theme, ctx, state), details, theme));
+	const arguments_ = getArgumentDetails(name, args);
+	if (Object.keys(arguments_).length > 0) container.addChild(renderArguments(arguments_, theme));
+	return container;
+}
+
+function appendFileResult(
+	container: Container,
+	definition: BuiltInDefinition,
+	state: RowState,
+	output: string,
+	editChanges: string,
+	theme: Theme,
+	isError: boolean,
+): void {
+	if (!state.expanded && !state.preview) return;
+	const component = definition.name === "edit" && editChanges
+		? renderEditChanges(editChanges, theme)
+		: renderOutput(output, theme, isError);
+	if (!component) return;
+	container.addChild(state.expanded ? component : limitComponentLines(component, runtime.config.previewLines, theme));
+}
+
+function renderFileResult(
+	definition: BuiltInDefinition,
+	result: AgentToolResult<unknown>,
+	options: ToolRenderResultOptions,
+	theme: Theme,
+	ctx: RenderContext,
+): Component {
+	const name = definition.name as CompactToolName;
+	const state = runtime.syncRow(ctx, options.isPartial, !options.isPartial);
+	runtime.syncExpansion(state, ctx.expanded, name);
+	if (canReuseResult(state, result, options, ctx)) return ctx.lastComponent;
+	const output = getFileOutput(name, ctx.args, result, ctx.isError);
+	const editChanges = name === "edit" ? getEditChanges(result) : "";
+	runtime.setResultAvailable(state, name, editChanges.length > 0 || output.length > 0);
+	const container = new CachedContainer();
+	appendFileResult(container, definition, state, output, editChanges, theme, ctx.isError);
+	if (!options.isPartial && !state.resultLineSummaryComputed) {
+		state.resultLineSummary = formatResultLineSummary(name, ctx.args, result, output);
+		state.resultLineSummaryComputed = true;
+	}
+	container.addChild(renderControls(theme, state, options.isPartial, ctx.isError, state.resultLineSummary));
+	rememberResult(state, result, options, ctx);
+	return container;
+}
+
+function renderShellCall(
+	name: ShellToolName,
+	args: BashToolInput,
+	theme: Theme,
+	ctx: RenderContext<BashToolInput>,
+): Component {
+	const state = runtime.syncRow(ctx, ctx.state.endedAt === undefined);
+	runtime.syncExpansion(state, ctx.expanded, name);
+	const command = normalizeLineEndings(args.command ?? "");
+	const details = state.expanded
+		? styleMultiline(command || "…", (line) => theme.fg("toolOutput", line))
+		: theme.fg("toolOutput", summarizeShellCommand(name, command));
+	return renderToolCall(renderCallTitle(name, theme, ctx, state), details, theme);
+}
+
+function renderShellResult(
+	name: ShellToolName,
+	result: AgentToolResult<BashToolDetails | undefined>,
+	options: ToolRenderResultOptions,
+	theme: Theme,
+	ctx: RenderContext<BashToolInput>,
+): Component {
+	const state = runtime.syncRow(ctx, options.isPartial, !options.isPartial);
+	runtime.syncExpansion(state, ctx.expanded, name);
+	if (canReuseResult(state, result, options, ctx)) return ctx.lastComponent;
+	const output = getTextResult(result);
+	runtime.setResultAvailable(state, name, output.length > 0);
+	if (!options.isPartial && !state.resultLineSummaryComputed) {
+		state.resultLineSummary = formatResultLineSummary(name, ctx.args, result, output);
+		state.resultLineSummaryComputed = true;
+	}
+	if (!state.expanded && !state.preview) {
+		const controls = renderControls(theme, state, options.isPartial, ctx.isError, state.resultLineSummary);
+		rememberResult(state, result, options, ctx);
+		return controls;
+	}
+	const container = new CachedContainer();
+	const component = renderOutput(output, theme, ctx.isError);
+	if (component) {
+		container.addChild(state.expanded ? component : limitComponentLines(component, runtime.config.previewLines, theme));
+	}
+	container.addChild(renderControls(theme, state, options.isPartial, ctx.isError, state.resultLineSummary));
+	rememberResult(state, result, options, ctx);
+	return container;
+}
+
+const toolFactories: Record<CompactToolName, (cwd: string) => BuiltInDefinition> = {
+	read: createReadToolDefinition,
+	write: createWriteToolDefinition,
+	edit: createEditToolDefinition,
+	bash: createBashToolDefinition,
+	powershell: createPowerShellToolDefinition,
+	grep: createGrepToolDefinition,
+	find: createFindToolDefinition,
+	ls: createLsToolDefinition,
+};
+
+function createBuiltInDefinition(name: CompactToolName, cwd: string): BuiltInDefinition {
+	return toolFactories[name](cwd);
+}
+
+function registerFileTool(pi: ExtensionAPI, definition: BuiltInDefinition): void {
+	pi.registerTool({
+		...definition,
+		execute: runtime.createTimedExecute(definition),
+		renderShell: "self",
+		renderCall: (args: ToolArgs, theme: Theme, ctx: RenderContext) => renderFileCall(definition, args, theme, ctx),
+		renderResult: (
+			result: AgentToolResult<unknown>,
+			options: ToolRenderResultOptions,
+			theme: Theme,
+			ctx: RenderContext,
+		) => renderFileResult(definition, result, options, theme, ctx),
+	} as ToolDefinition<any, any, RowState>);
+}
+
+function registerShellTool(pi: ExtensionAPI, definition: BuiltInDefinition): void {
+	const name = definition.name as ShellToolName;
+	pi.registerTool({
+		...definition,
+		execute: runtime.createTimedExecute(definition),
+		renderShell: "self",
+		renderCall: (args: BashToolInput, theme: Theme, ctx: RenderContext<BashToolInput>) =>
+			renderShellCall(name, args, theme, ctx),
+		renderResult: (
+			result: AgentToolResult<BashToolDetails | undefined>,
+			options: ToolRenderResultOptions,
+			theme: Theme,
+			ctx: RenderContext<BashToolInput>,
+		) => renderShellResult(name, result, options, theme, ctx),
+	} as ToolDefinition<any, BashToolDetails | undefined, RowState>);
+}
+
+function registerTools(pi: ExtensionAPI, cwd: string): void {
+	const enabledTools = new Set(runtime.config.tools);
+	for (const name of registeredTools) {
+		// Pi exposes no unregister API, so restoring a disabled tool means re-registering
+		// the built-in definition to release this extension's renderers.
+		if (!enabledTools.has(name)) pi.registerTool(createBuiltInDefinition(name, cwd));
+	}
+	registeredTools.clear();
+	for (const name of runtime.config.tools) {
+		const definition = createBuiltInDefinition(name, cwd);
+		if (name === "bash" || name === "powershell") registerShellTool(pi, definition);
+		else registerFileTool(pi, definition);
+		registeredTools.add(name);
+	}
+}
+
+function configure(pi: ExtensionAPI, cwd?: string, projectTrusted = false): void {
+	const resolvedCwd = cwd ?? process.cwd();
+	const config = loadConfig(resolvedCwd, projectTrusted);
+	const signature = JSON.stringify([resolvedCwd, config]);
+	if (signature === registeredConfiguration) return;
+	runtime.configure(config);
+	registerTools(pi, resolvedCwd);
+	registeredConfiguration = signature;
+}
+
+export default function compactTools(pi: ExtensionAPI): void {
+	const thinkingCycle = new ThinkingCycleController(pi);
+	const progress = new ProgressController(pi);
+	// Register once while the extension runtime is being built. In particular, this
+	// makes the overrides available before Pi restores the active tool set on /reload.
+	configure(pi, process.cwd());
+	pi.on("session_start", (event, ctx) => {
+		if (event.reason !== "reload") runtime.clearTimings();
+		configure(pi, ctx.cwd, ctx.isProjectTrusted());
+		if (ctx.mode === "tui") {
+			progress.bind(ctx);
+			thinkingCycle.bind(ctx);
+		} else {
+			progress.dispose();
+			thinkingCycle.dispose();
+		}
+	});
+	pi.on("session_shutdown", (event) => {
+		thinkingCycle.dispose();
+		progress.dispose();
+		runtime.reset(event.reason !== "reload");
+		// Some Pi hosts rebuild the active tool registry during reload while keeping
+		// this module instance. Force the next session to restore our renderers.
+		if (event.reason === "reload") registeredConfiguration = undefined;
+	});
+}