@oh-my-pi/pi-coding-agent 5.5.0 → 5.6.70

package/src/modes/interactive/components/settings-selector.ts

@@ -1,11 +1,7 @@
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import {
 	Container,
-	isArrowLeft,
-	isArrowRight,
-	isEscape,
-	isShiftTab,
-	isTab,
+	matchesKey,
 	type SelectItem,
 	SelectList,
 	type SettingItem,
@@ -118,7 +114,10 @@ class SelectSubmenu extends Container {
 type TabId = string;
 
 const SETTINGS_TABS: Tab[] = [
-	{ id: "config", label: "Config" },
+	{ id: "behavior", label: "Behavior" },
+	{ id: "tools", label: "Tools" },
+	{ id: "display", label: "Display" },
+	{ id: "voice", label: "Voice" },
 	{ id: "status", label: "Status" },
 	{ id: "lsp", label: "LSP" },
 	{ id: "exa", label: "Exa" },
@@ -172,7 +171,7 @@ export class SettingsSelectorComponent extends Container {
 	private pluginComponent: PluginSettingsComponent | null = null;
 	private statusPreviewContainer: Container | null = null;
 	private statusPreviewText: Text | null = null;
-	private currentTabId: TabId = "config";
+	private currentTabId: TabId = "behavior";
 
 	private settingsManager: SettingsManager;
 	private context: SettingsRuntimeContext;
@@ -199,7 +198,7 @@ export class SettingsSelectorComponent extends Container {
 		this.addChild(new Spacer(1));
 
 		// Initialize with first tab
-		this.switchToTab("config");
+		this.switchToTab("behavior");
 
 		// Add bottom border
 		this.addChild(new DynamicBorder());
@@ -524,13 +523,18 @@ export class SettingsSelectorComponent extends Container {
 
 	handleInput(data: string): void {
 		// Handle tab switching first (tab, shift+tab, or left/right arrows)
-		if (isTab(data) || isShiftTab(data) || isArrowLeft(data) || isArrowRight(data)) {
+		if (
+			matchesKey(data, "tab") ||
+			matchesKey(data, "shift+tab") ||
+			matchesKey(data, "left") ||
+			matchesKey(data, "right")
+		) {
 			this.tabBar.handleInput(data);
 			return;
 		}
 
 		// Escape at top level cancels
-		if (isEscape(data) && !this.currentSubmenu) {
+		if ((matchesKey(data, "escape") || matchesKey(data, "esc")) && !this.currentSubmenu) {
 			this.callbacks.onCancel();
 			return;
 		}

package/src/modes/interactive/components/status-line-segment-editor.ts

@@ -9,7 +9,7 @@
  * - Live preview shown in the actual status line above
  */
 
-import { Container, isArrowDown, isArrowUp, isEnter, isEscape, isShiftTab, isTab } from "@oh-my-pi/pi-tui";
+import { Container, matchesKey } from "@oh-my-pi/pi-tui";
 import type { StatusLineSegmentId } from "../../../core/settings-manager";
 import { theme } from "../theme/theme";
 import { ALL_SEGMENT_IDS } from "./status-line/segments";
@@ -109,7 +109,7 @@ export class StatusLineSegmentEditorComponent extends Container {
 	handleInput(data: string): void {
 		const columnSegments = this.getCurrentColumnSegments();
 
-		if (isArrowUp(data) || data === "k") {
+		if (matchesKey(data, "up") || data === "k") {
 			// Move selection up within column, or jump to previous column
 			if (this.selectedIndex > 0) {
 				this.selectedIndex--;
@@ -135,7 +135,7 @@ export class StatusLineSegmentEditorComponent extends Container {
 					}
 				}
 			}
-		} else if (isArrowDown(data) || data === "j") {
+		} else if (matchesKey(data, "down") || data === "j") {
 			// Move selection down within column, or jump to next column
 			if (this.selectedIndex < columnSegments.length - 1) {
 				this.selectedIndex++;
@@ -161,7 +161,7 @@ export class StatusLineSegmentEditorComponent extends Container {
 					}
 				}
 			}
-		} else if (isTab(data)) {
+		} else if (matchesKey(data, "tab")) {
 			// Cycle segment: left → right → disabled → left
 			const seg = columnSegments[this.selectedIndex];
 			if (seg) {
@@ -180,7 +180,7 @@ export class StatusLineSegmentEditorComponent extends Container {
 				this.recompactColumn(oldColumn);
 				this.triggerPreview();
 			}
-		} else if (isShiftTab(data)) {
+		} else if (matchesKey(data, "shift+tab")) {
 			// Reverse cycle: left ← right ← disabled ← left
 			const seg = columnSegments[this.selectedIndex];
 			if (seg) {
@@ -235,11 +235,11 @@ export class StatusLineSegmentEditorComponent extends Container {
 				this.selectedIndex++;
 				this.triggerPreview();
 			}
-		} else if (isEnter(data)) {
+		} else if (matchesKey(data, "enter") || matchesKey(data, "return") || data === "\n") {
 			const left = this.getSegmentsForColumn("left").map((s) => s.id);
 			const right = this.getSegmentsForColumn("right").map((s) => s.id);
 			this.callbacks.onSave(left, right);
-		} else if (isEscape(data)) {
+		} else if (matchesKey(data, "escape") || matchesKey(data, "esc")) {
 			this.callbacks.onCancel();
 		}
 	}

package/src/modes/interactive/components/tool-execution.ts

@@ -13,6 +13,7 @@ import {
 import stripAnsi from "strip-ansi";
 import { BASH_DEFAULT_PREVIEW_LINES } from "../../../core/tools/bash";
 import { computeEditDiff, type EditDiffError, type EditDiffResult } from "../../../core/tools/edit-diff";
+import { PYTHON_DEFAULT_PREVIEW_LINES } from "../../../core/tools/python";
 import { toolRenderers } from "../../../core/tools/renderers";
 import { convertToPng } from "../../../utils/image-convert";
 import { sanitizeBinaryOutput } from "../../../utils/shell";
@@ -507,6 +508,13 @@ export class ToolExecutionComponent extends Container {
 			context.output = output;
 			context.expanded = this.expanded;
 			context.previewLines = BASH_DEFAULT_PREVIEW_LINES;
+			context.timeout = typeof this.args?.timeout === "number" ? this.args.timeout : undefined;
+		} else if (this.toolName === "python" && this.result) {
+			const output = this.getTextOutput().trim();
+			context.output = output;
+			context.expanded = this.expanded;
+			context.previewLines = PYTHON_DEFAULT_PREVIEW_LINES;
+			context.timeout = typeof this.args?.timeout === "number" ? this.args.timeout : undefined;
 		} else if (this.toolName === "edit") {
 			// Edit needs diff preview and renderDiff function
 			context.editDiffPreview = this.editDiffPreview;

package/src/modes/interactive/components/tree-selector.ts

@@ -2,16 +2,7 @@ import {
 	type Component,
 	Container,
 	Input,
-	isArrowDown,
-	isArrowLeft,
-	isArrowRight,
-	isArrowUp,
-	isBackspace,
-	isCtrlC,
-	isCtrlO,
-	isEnter,
-	isEscape,
-	isShiftCtrlO,
+	matchesKey,
 	Spacer,
 	Text,
 	TruncatedText,
@@ -660,43 +651,58 @@ class TreeList implements Component {
 	}
 
 	handleInput(keyData: string): void {
-		if (isArrowUp(keyData)) {
+		if (matchesKey(keyData, "up")) {
 			this.selectedIndex = this.selectedIndex === 0 ? this.filteredNodes.length - 1 : this.selectedIndex - 1;
-		} else if (isArrowDown(keyData)) {
+		} else if (matchesKey(keyData, "down")) {
 			this.selectedIndex = this.selectedIndex === this.filteredNodes.length - 1 ? 0 : this.selectedIndex + 1;
-		} else if (isArrowLeft(keyData)) {
+		} else if (matchesKey(keyData, "left")) {
 			// Page up
 			this.selectedIndex = Math.max(0, this.selectedIndex - this.maxVisibleLines);
-		} else if (isArrowRight(keyData)) {
+		} else if (matchesKey(keyData, "right")) {
 			// Page down
 			this.selectedIndex = Math.min(this.filteredNodes.length - 1, this.selectedIndex + this.maxVisibleLines);
-		} else if (isEnter(keyData)) {
+		} else if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
 			const selected = this.filteredNodes[this.selectedIndex];
 			if (selected && this.onSelect) {
 				this.onSelect(selected.node.entry.id);
 			}
-		} else if (isEscape(keyData)) {
+		} else if (matchesKey(keyData, "escape") || matchesKey(keyData, "esc")) {
 			if (this.searchQuery) {
 				this.searchQuery = "";
 				this.applyFilter();
 			} else {
 				this.onCancel?.();
 			}
-		} else if (isCtrlC(keyData)) {
+		} else if (matchesKey(keyData, "ctrl+c")) {
 			this.onCancel?.();
-		} else if (isShiftCtrlO(keyData)) {
+		} else if (matchesKey(keyData, "shift+ctrl+o") || matchesKey(keyData, "ctrl+shift+o")) {
 			// Cycle filter backwards
 			const modes: FilterMode[] = ["default", "no-tools", "user-only", "labeled-only", "all"];
 			const currentIndex = modes.indexOf(this.filterMode);
 			this.filterMode = modes[(currentIndex - 1 + modes.length) % modes.length];
 			this.applyFilter();
-		} else if (isCtrlO(keyData)) {
+		} else if (matchesKey(keyData, "ctrl+o")) {
 			// Cycle filter forwards: default → no-tools → user-only → labeled-only → all → default
 			const modes: FilterMode[] = ["default", "no-tools", "user-only", "labeled-only", "all"];
 			const currentIndex = modes.indexOf(this.filterMode);
 			this.filterMode = modes[(currentIndex + 1) % modes.length];
 			this.applyFilter();
-		} else if (isBackspace(keyData)) {
+		} else if (matchesKey(keyData, "alt+d")) {
+			this.filterMode = "default";
+			this.applyFilter();
+		} else if (matchesKey(keyData, "alt+t")) {
+			this.filterMode = "no-tools";
+			this.applyFilter();
+		} else if (matchesKey(keyData, "alt+u")) {
+			this.filterMode = "user-only";
+			this.applyFilter();
+		} else if (matchesKey(keyData, "alt+l")) {
+			this.filterMode = "labeled-only";
+			this.applyFilter();
+		} else if (matchesKey(keyData, "alt+a")) {
+			this.filterMode = "all";
+			this.applyFilter();
+		} else if (matchesKey(keyData, "backspace")) {
 			if (this.searchQuery.length > 0) {
 				this.searchQuery = this.searchQuery.slice(0, -1);
 				this.applyFilter();
@@ -764,10 +770,10 @@ class LabelInput implements Component {
 	}
 
 	handleInput(keyData: string): void {
-		if (isEnter(keyData)) {
+		if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
 			const value = this.input.getValue().trim();
 			this.onSubmit?.(this.entryId, value || undefined);
-		} else if (isEscape(keyData)) {
+		} else if (matchesKey(keyData, "escape") || matchesKey(keyData, "esc")) {
 			this.onCancel?.();
 		} else {
 			this.input.handleInput(keyData);
@@ -815,7 +821,7 @@ export class TreeSelectorComponent extends Container {
 			new TruncatedText(
 				theme.fg(
 					"muted",
-					"  Up/Down: move. Left/Right: page. l: label. Ctrl+O/Shift+Ctrl+O: filter. Type to search",
+					"  Up/Down: move. Left/Right: page. l: label. Ctrl+O/Shift+Ctrl+O: filter. Alt+D/T/U/L/A: filter. Type to search",
 				),
 				0,
 				0,

package/src/modes/interactive/components/user-message-selector.ts

@@ -1,15 +1,4 @@
-import {
-	type Component,
-	Container,
-	isArrowDown,
-	isArrowUp,
-	isCtrlC,
-	isEnter,
-	isEscape,
-	Spacer,
-	Text,
-	truncateToWidth,
-} from "@oh-my-pi/pi-tui";
+import { type Component, Container, matchesKey, Spacer, Text, truncateToWidth } from "@oh-my-pi/pi-tui";
 import { theme } from "../theme/theme";
 import { DynamicBorder } from "./dynamic-border";
 
@@ -90,28 +79,28 @@ class UserMessageList implements Component {
 
 	handleInput(keyData: string): void {
 		// Up arrow - go to previous (older) message, wrap to bottom when at top
-		if (isArrowUp(keyData)) {
+		if (matchesKey(keyData, "up")) {
 			this.selectedIndex = this.selectedIndex === 0 ? this.messages.length - 1 : this.selectedIndex - 1;
 		}
 		// Down arrow - go to next (newer) message, wrap to top when at bottom
-		else if (isArrowDown(keyData)) {
+		else if (matchesKey(keyData, "down")) {
 			this.selectedIndex = this.selectedIndex === this.messages.length - 1 ? 0 : this.selectedIndex + 1;
 		}
 		// Enter - select message and branch
-		else if (isEnter(keyData)) {
+		else if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
 			const selected = this.messages[this.selectedIndex];
 			if (selected && this.onSelect) {
 				this.onSelect(selected.id);
 			}
 		}
 		// Escape - cancel
-		else if (isEscape(keyData)) {
+		else if (matchesKey(keyData, "escape") || matchesKey(keyData, "esc")) {
 			if (this.onCancel) {
 				this.onCancel();
 			}
 		}
 		// Ctrl+C - cancel
-		else if (isCtrlC(keyData)) {
+		else if (matchesKey(keyData, "ctrl+c")) {
 			if (this.onCancel) {
 				this.onCancel();
 			}

package/src/modes/interactive/controllers/command-controller.ts

@@ -5,7 +5,9 @@ import { Loader, Markdown, Spacer, Text, visibleWidth } from "@oh-my-pi/pi-tui";
 import { nanoid } from "nanoid";
 import { getDebugLogPath } from "../../../config";
 import { loadCustomShare } from "../../../core/custom-share";
+import type { CompactOptions } from "../../../core/extensions/types";
 import { createCompactionSummaryMessage } from "../../../core/messages";
+import { getGatewayStatus } from "../../../core/python-gateway-coordinator";
 import type { TruncationResult } from "../../../core/tools/truncate";
 import { getChangelogPath, parseChangelog } from "../../../utils/changelog";
 import { copyToClipboard } from "../../../utils/clipboard";
@@ -172,40 +174,37 @@ export class CommandController {
 		};
 
 		try {
-			const result = await new Promise<{ stdout: string; stderr: string; code: number | null }>((resolve) => {
-				proc = Bun.spawn(["gh", "gist", "create", "--public=false", tmpFile], {
-					stdout: "pipe",
-					stderr: "pipe",
-				});
-				let stdout = "";
-				let stderr = "";
-
-				const stdoutReader = (proc.stdout as ReadableStream<Uint8Array>).getReader();
-				const stderrReader = (proc.stderr as ReadableStream<Uint8Array>).getReader();
+			proc = Bun.spawn(["gh", "gist", "create", "--public=false", tmpFile], {
+				stdout: "pipe",
+				stderr: "pipe",
+			});
+
+			const readStream = async (stream: ReadableStream<Uint8Array> | null): Promise<string> => {
+				if (!stream) return "";
+				const reader = stream.getReader();
 				const decoder = new TextDecoder();
+				let output = "";
+				try {
+					while (true) {
+						const { done, value } = await reader.read();
+						if (done) break;
+						output += decoder.decode(value, { stream: true });
+					}
+				} catch {
+					// Ignore read errors
+				} finally {
+					output += decoder.decode();
+					reader.releaseLock();
+				}
+				return output;
+			};
 
-				(async () => {
-					try {
-						while (true) {
-							const { done, value } = await stdoutReader.read();
-							if (done) break;
-							stdout += decoder.decode(value);
-						}
-					} catch {}
-				})();
-
-				(async () => {
-					try {
-						while (true) {
-							const { done, value } = await stderrReader.read();
-							if (done) break;
-							stderr += decoder.decode(value);
-						}
-					} catch {}
-				})();
-
-				proc.exited.then((code) => resolve({ stdout, stderr, code }));
-			});
+			const [stdout, stderr, code] = await Promise.all([
+				readStream(proc.stdout as ReadableStream<Uint8Array> | null),
+				readStream(proc.stderr as ReadableStream<Uint8Array> | null),
+				proc.exited.catch(() => 1),
+			]);
+			const result = { stdout, stderr, code };
 
 			if (loader.signal.aborted) return;
 
@@ -275,7 +274,47 @@ export class CommandController {
 
 		if (stats.cost > 0) {
 			info += `\n${theme.bold("Cost")}\n`;
-			info += `${theme.fg("dim", "Total:")} ${stats.cost.toFixed(4)}`;
+			info += `${theme.fg("dim", "Total:")} ${stats.cost.toFixed(4)}\n`;
+		}
+
+		const gateway = getGatewayStatus();
+		info += `\n${theme.bold("Python Gateway")}\n`;
+		if (gateway.active) {
+			const mode = gateway.shared ? "Shared" : "Local";
+			info += `${theme.fg("dim", "Status:")} ${theme.fg("success", `Active (${mode})`)}\n`;
+			info += `${theme.fg("dim", "URL:")} ${gateway.url}\n`;
+			info += `${theme.fg("dim", "PID:")} ${gateway.pid}\n`;
+			info += `${theme.fg("dim", "Clients:")} ${gateway.refCount}\n`;
+			if (gateway.uptime !== null) {
+				const uptimeSec = Math.floor(gateway.uptime / 1000);
+				const mins = Math.floor(uptimeSec / 60);
+				const secs = uptimeSec % 60;
+				info += `${theme.fg("dim", "Uptime:")} ${mins}m ${secs}s\n`;
+			}
+		} else {
+			info += `${theme.fg("dim", "Status:")} ${theme.fg("dim", "Inactive")}\n`;
+		}
+
+		if (this.ctx.lspServers && this.ctx.lspServers.length > 0) {
+			info += `\n${theme.bold("LSP Servers")}\n`;
+			for (const server of this.ctx.lspServers) {
+				const statusColor = server.status === "ready" ? "success" : "error";
+				info += `${theme.fg("dim", `${server.name}:`)} ${theme.fg(statusColor, server.status)} ${theme.fg("dim", `(${server.fileTypes.join(", ")})`)}\n`;
+			}
+		}
+
+		if (this.ctx.mcpManager) {
+			const mcpServers = this.ctx.mcpManager.getConnectedServers();
+			info += `\n${theme.bold("MCP Servers")}\n`;
+			if (mcpServers.length === 0) {
+				info += `${theme.fg("dim", "None connected")}\n`;
+			} else {
+				for (const name of mcpServers) {
+					const conn = this.ctx.mcpManager.getConnection(name);
+					const toolCount = conn?.tools?.length ?? 0;
+					info += `${theme.fg("dim", `${name}:`)} ${theme.fg("success", "connected")} ${theme.fg("dim", `(${toolCount} tools)`)}\n`;
+				}
+			}
 		}
 
 		this.ctx.chatContainer.addChild(new Spacer(1));
@@ -305,6 +344,7 @@ export class CommandController {
 	}
 
 	handleHotkeysCommand(): void {
+		const expandToolsKey = this.ctx.keybindings.getDisplayString("expandTools") || "Ctrl+O";
 		const hotkeys = `
 **Navigation**
 | Key | Action |
@@ -337,7 +377,7 @@ export class CommandController {
 | \`Alt+P\` | Select model (temporary) |
 | \`Ctrl+L\` | Select model (set roles) |
 | \`Ctrl+R\` | Search prompt history |
-| \`Ctrl+O\` | Toggle tool output expansion |
+| \`${expandToolsKey}\` | Toggle tool output expansion |
 | \`Ctrl+T\` | Toggle todo list expansion |
 | \`Ctrl+G\` | Edit message in external editor |
 | \`/\` | Slash commands |
@@ -481,14 +521,18 @@ export class CommandController {
 		try {
 			const content = fs.readFileSync(skillPath, "utf-8");
 			const body = content.replace(/^---\n[\s\S]*?\n---\n/, "").trim();
-			const message = args ? `${body}\n\n---\n\nUser: ${args}` : body;
+			const metaLines = [`Skill: ${skillPath}`];
+			if (args) {
+				metaLines.push(`User: ${args}`);
+			}
+			const message = `${body}\n\n---\n\n${metaLines.join("\n")}`;
 			await this.ctx.session.prompt(message);
 		} catch (err) {
 			this.ctx.showError(`Failed to load skill: ${err instanceof Error ? err.message : String(err)}`);
 		}
 	}
 
-	async executeCompaction(customInstructions?: string, isAuto = false): Promise<void> {
+	async executeCompaction(customInstructionsOrOptions?: string | CompactOptions, isAuto = false): Promise<void> {
 		if (this.ctx.loadingAnimation) {
 			this.ctx.loadingAnimation.stop();
 			this.ctx.loadingAnimation = undefined;
@@ -513,7 +557,12 @@ export class CommandController {
 		this.ctx.ui.requestRender();
 
 		try {
-			const result = await this.ctx.session.compact(customInstructions);
+			const instructions = typeof customInstructionsOrOptions === "string" ? customInstructionsOrOptions : undefined;
+			const options =
+				customInstructionsOrOptions && typeof customInstructionsOrOptions === "object"
+					? customInstructionsOrOptions
+					: undefined;
+			const result = await this.ctx.session.compact(instructions, options);
 
 			this.ctx.rebuildChatFromMessages();
 

package/src/modes/interactive/controllers/event-controller.ts

@@ -12,6 +12,7 @@ import type { InteractiveModeContext, TodoItem } from "../types";
 export class EventController {
 	private lastReadGroup: ReadToolGroupComponent | undefined = undefined;
 	private lastThinkingCount = 0;
+	private renderedCustomMessages = new Set<string>();
 
 	constructor(private ctx: InteractiveModeContext) {}
 
@@ -73,6 +74,11 @@ export class EventController {
 
 			case "message_start":
 				if (event.message.role === "hookMessage" || event.message.role === "custom") {
+					const signature = `${event.message.role}:${event.message.customType}:${event.message.timestamp}`;
+					if (this.renderedCustomMessages.has(signature)) {
+						break;
+					}
+					this.renderedCustomMessages.add(signature);
 					this.resetReadGroup();
 					this.ctx.addMessageToChat(event.message);
 					this.ctx.ui.requestRender();
@@ -324,6 +330,8 @@ export class EventController {
 					});
 					this.ctx.statusLine.invalidate();
 					this.ctx.updateEditorTopBorder();
+				} else {
+					this.ctx.showWarning("Auto-compaction failed; continuing without compaction");
 				}
 				await this.ctx.flushCompactionQueue({ willRetry: event.willRetry });
 				this.ctx.ui.requestRender();

package/src/modes/interactive/controllers/extension-ui-controller.ts

@@ -87,6 +87,9 @@ export class ExtensionUiController {
 			appendEntry: (customType, data) => {
 				this.ctx.sessionManager.appendCustomEntry(customType, data);
 			},
+			setLabel: (targetId, label) => {
+				this.ctx.sessionManager.appendLabelChange(targetId, label);
+			},
 			getActiveTools: () => this.ctx.session.getActiveToolNames(),
 			getAllTools: () => this.ctx.session.getAllToolNames(),
 			setActiveTools: (toolNames) => this.ctx.session.setActiveToolsByName(toolNames),
@@ -107,8 +110,16 @@ export class ExtensionUiController {
 			shutdown: () => {
 				// Signal shutdown request (will be handled by main loop)
 			},
+			getContextUsage: () => this.ctx.session.getContextUsage(),
+			compact: async (instructionsOrOptions) => {
+				const instructions = typeof instructionsOrOptions === "string" ? instructionsOrOptions : undefined;
+				const options =
+					instructionsOrOptions && typeof instructionsOrOptions === "object" ? instructionsOrOptions : undefined;
+				await this.ctx.session.compact(instructions, options);
+			},
 		};
 		const commandActions: ExtensionCommandContextActions = {
+			getContextUsage: () => this.ctx.session.getContextUsage(),
 			waitForIdle: () => this.ctx.session.agent.waitForIdle(),
 			newSession: async (options) => {
 				// Stop any loading animation
@@ -178,6 +189,16 @@ export class ExtensionUiController {
 
 				return { cancelled: false };
 			},
+			compact: async (instructionsOrOptions) => {
+				const instructions = typeof instructionsOrOptions === "string" ? instructionsOrOptions : undefined;
+				const options =
+					instructionsOrOptions && typeof instructionsOrOptions === "object" ? instructionsOrOptions : undefined;
+				if (this.ctx.isBackgrounded) {
+					await this.ctx.session.compact(instructions, options);
+					return;
+				}
+				await this.ctx.executeCompaction(instructionsOrOptions, false);
+			},
 		};
 
 		extensionRunner.initialize(actions, contextActions, commandActions, uiContext);
@@ -235,6 +256,9 @@ export class ExtensionUiController {
 			appendEntry: (customType, data) => {
 				this.ctx.sessionManager.appendCustomEntry(customType, data);
 			},
+			setLabel: (targetId, label) => {
+				this.ctx.sessionManager.appendLabelChange(targetId, label);
+			},
 			getActiveTools: () => this.ctx.session.getActiveToolNames(),
 			getAllTools: () => this.ctx.session.getAllToolNames(),
 			setActiveTools: (toolNames) => this.ctx.session.setActiveToolsByName(toolNames),
@@ -255,8 +279,16 @@ export class ExtensionUiController {
 			shutdown: () => {
 				// Signal shutdown request (will be handled by main loop)
 			},
+			getContextUsage: () => this.ctx.session.getContextUsage(),
+			compact: async (instructionsOrOptions) => {
+				const instructions = typeof instructionsOrOptions === "string" ? instructionsOrOptions : undefined;
+				const options =
+					instructionsOrOptions && typeof instructionsOrOptions === "object" ? instructionsOrOptions : undefined;
+				await this.ctx.session.compact(instructions, options);
+			},
 		};
 		const commandActions: ExtensionCommandContextActions = {
+			getContextUsage: () => this.ctx.session.getContextUsage(),
 			waitForIdle: () => this.ctx.session.agent.waitForIdle(),
 			newSession: async (options) => {
 				if (this.ctx.isBackgrounded) {
@@ -335,6 +367,16 @@ export class ExtensionUiController {
 
 				return { cancelled: false };
 			},
+			compact: async (instructionsOrOptions) => {
+				const instructions = typeof instructionsOrOptions === "string" ? instructionsOrOptions : undefined;
+				const options =
+					instructionsOrOptions && typeof instructionsOrOptions === "object" ? instructionsOrOptions : undefined;
+				if (this.ctx.isBackgrounded) {
+					await this.ctx.session.compact(instructions, options);
+					return;
+				}
+				await this.ctx.executeCompaction(instructionsOrOptions, false);
+			},
 		};
 
 		extensionRunner.initialize(actions, contextActions, commandActions, uiContext);
@@ -382,6 +424,15 @@ export class ExtensionUiController {
 				try {
 					await registeredTool.definition.onSession(event, {
 						ui: uiContext,
+						getContextUsage: () => this.ctx.session.getContextUsage(),
+						compact: async (instructionsOrOptions) => {
+							const instructions = typeof instructionsOrOptions === "string" ? instructionsOrOptions : undefined;
+							const options =
+								instructionsOrOptions && typeof instructionsOrOptions === "object"
+									? instructionsOrOptions
+									: undefined;
+							await this.ctx.session.compact(instructions, options);
+						},
 						hasUI: !this.ctx.isBackgrounded,
 						cwd: this.ctx.sessionManager.getCwd(),
 						sessionManager: this.ctx.session.sessionManager,