@oh-my-pi/pi-coding-agent 16.0.4 → 16.0.6

package/src/modes/controllers/btw-controller.ts

@@ -1,3 +1,4 @@
+import type { AssistantMessage } from "@oh-my-pi/pi-ai";
 import { prompt } from "@oh-my-pi/pi-utils";
 import btwUserPrompt from "../../prompts/system/btw-user.md" with { type: "text" };
 import { BtwPanelComponent } from "../components/btw-panel";
@@ -7,10 +8,37 @@ interface BtwRequest {
 	component: BtwPanelComponent;
 	abortController: AbortController;
 	question: string;
+	leafId: string | null;
+}
+
+function assistantMessageWithReplyText(assistantMessage: AssistantMessage, replyText: string): AssistantMessage {
+	const content: AssistantMessage["content"] = [];
+	let replacedText = false;
+	for (const part of assistantMessage.content) {
+		if (part.type === "thinking") {
+			content.push({ type: "thinking", thinking: part.thinking });
+			continue;
+		}
+		if (part.type === "redactedThinking") continue;
+		if (part.type !== "text") {
+			content.push(part);
+			continue;
+		}
+		if (replacedText) continue;
+		content.push({ type: "text", text: replyText });
+		replacedText = true;
+	}
+	if (!replacedText) content.push({ type: "text", text: replyText });
+	return { ...assistantMessage, content, providerPayload: undefined };
 }
 
 export class BtwController {
 	#activeRequest: BtwRequest | undefined;
+	#lastQuestion: string | undefined;
+	#lastReplyText: string | undefined;
+	#lastAssistantMessage: AssistantMessage | undefined;
+	#lastLeafId: string | null | undefined;
+	#branchInFlight = false;
 
 	constructor(private readonly ctx: InteractiveModeContext) {}
 
@@ -18,6 +46,29 @@ export class BtwController {
 		return this.#activeRequest !== undefined;
 	}
 
+	canBranch(): boolean {
+		return (
+			!this.#branchInFlight &&
+			this.#activeRequest?.component.isBranchable() === true &&
+			this.#lastQuestion !== undefined &&
+			this.#lastReplyText !== undefined &&
+			this.#lastAssistantMessage !== undefined &&
+			this.#lastLeafId !== null &&
+			this.#lastLeafId === this.ctx.sessionManager.getLeafId()
+		);
+	}
+
+	async handleBranch(): Promise<boolean> {
+		if (!this.canBranch() || !this.#lastQuestion || !this.#lastAssistantMessage) return false;
+		this.#branchInFlight = true;
+		try {
+			await this.ctx.handleBtwBranch(this.#lastQuestion, this.#lastAssistantMessage);
+			return true;
+		} finally {
+			this.#branchInFlight = false;
+		}
+	}
+
 	handleEscape(): boolean {
 		if (!this.#activeRequest) return false;
 		this.#closeActiveRequest({ abort: this.#activeRequest.abortController.signal.aborted === false });
@@ -47,6 +98,7 @@ export class BtwController {
 			component: new BtwPanelComponent({ question: trimmedQuestion, tui: this.ctx.ui }),
 			abortController: new AbortController(),
 			question: trimmedQuestion,
+			leafId: this.ctx.sessionManager.getLeafId(),
 		};
 		this.ctx.btwContainer.clear();
 		this.ctx.btwContainer.addChild(request.component);
@@ -58,7 +110,7 @@ export class BtwController {
 	async #runRequest(request: BtwRequest): Promise<void> {
 		try {
 			const promptText = prompt.render(btwUserPrompt, { question: request.question });
-			const { replyText } = await this.ctx.session.runEphemeralTurn({
+			const { replyText, assistantMessage } = await this.ctx.session.runEphemeralTurn({
 				promptText,
 				onTextDelta: delta => {
 					if (this.#isActiveRequest(request)) {
@@ -75,6 +127,14 @@ export class BtwController {
 				request.component.setAnswer(replyText);
 			}
 			request.component.markComplete();
+			if (request.component.isBranchable()) {
+				this.#lastQuestion = request.question;
+				this.#lastReplyText = replyText;
+				this.#lastAssistantMessage = assistantMessageWithReplyText(assistantMessage, replyText);
+				this.#lastLeafId = request.leafId;
+			} else {
+				this.#clearBranchState();
+			}
 		} catch (error) {
 			if (!this.#isActiveRequest(request)) {
 				return;
@@ -91,6 +151,7 @@ export class BtwController {
 		const request = this.#activeRequest;
 		if (!request) return;
 		this.#activeRequest = undefined;
+		this.#clearBranchState();
 		if (options.abort) {
 			request.abortController.abort();
 		}
@@ -99,6 +160,13 @@ export class BtwController {
 		this.ctx.ui.requestRender();
 	}
 
+	#clearBranchState(): void {
+		this.#lastQuestion = undefined;
+		this.#lastReplyText = undefined;
+		this.#lastAssistantMessage = undefined;
+		this.#lastLeafId = undefined;
+	}
+
 	#isActiveRequest(request: BtwRequest): boolean {
 		return this.#activeRequest === request;
 	}

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

@@ -1,6 +1,5 @@
 import { INTENT_FIELD } from "@oh-my-pi/pi-agent-core";
-import { calculatePromptTokens } from "@oh-my-pi/pi-agent-core/compaction/compaction";
-import type { AssistantMessage, ImageContent } from "@oh-my-pi/pi-ai";
+import type { ImageContent } from "@oh-my-pi/pi-ai";
 import { type Component, Loader, TERMINAL } from "@oh-my-pi/pi-tui";
 import { extractTextContent } from "../../commit/utils";
 import { settings } from "../../config/settings";
@@ -1107,11 +1106,7 @@ export class EventController {
 	}
 
 	#currentContextTokens(): number {
-		const lastAssistant = this.ctx.viewSession.agent.state.messages
-			.slice()
-			.reverse()
-			.find((m): m is AssistantMessage => m.role === "assistant" && m.stopReason !== "aborted");
-		return lastAssistant?.usage ? calculatePromptTokens(lastAssistant.usage) : 0;
+		return this.ctx.viewSession.getContextUsage()?.tokens ?? 0;
 	}
 
 	sendCompletionNotification(): void {

package/src/modes/controllers/input-controller.ts

@@ -78,6 +78,7 @@ export class InputController {
 
 	#enhancedPaste?: EnhancedPasteController;
 	#focusedLeftTapListenerInstalled = false;
+	#btwBranchListenerInstalled = false;
 	// Tap counter for the double-← gesture; reset whenever a quiet gap
 	// (>= LEFT_DOUBLE_TAP_MAX_GAP_MS) starts a fresh sequence. See
 	// #detectLeftDoubleTap.
@@ -143,6 +144,16 @@ export class InputController {
 				return { consume: true };
 			});
 		}
+		if (!this.#btwBranchListenerInstalled) {
+			this.#btwBranchListenerInstalled = true;
+			this.ctx.ui.addInputListener(data => {
+				if (!matchesKey(data, "b")) return undefined;
+				if (!this.ctx.canBranchBtw()) return undefined;
+				if (this.ctx.editor.getText().trim()) return undefined;
+				void this.ctx.handleBtwBranchKey();
+				return { consume: true };
+			});
+		}
 		this.ctx.editor.onEscape = () => {
 			// Active context maintenance owns Esc: auto/manual compaction,
 			// handoff generation, and auto-retry backoff all advertise
@@ -304,6 +315,8 @@ export class InputController {
 		this.ctx.editor.onExpandTools = () => this.toggleToolOutputExpansion();
 		this.ctx.editor.setActionKeys("app.message.dequeue", this.ctx.keybindings.getKeys("app.message.dequeue"));
 		this.ctx.editor.onDequeue = () => this.handleDequeue();
+		this.ctx.editor.setActionKeys("app.retry", this.ctx.keybindings.getKeys("app.retry"));
+		this.ctx.editor.onRetry = () => void this.handleRetry();
 		this.ctx.editor.clearCustomKeyHandlers();
 		// Wire up extension shortcuts
 		this.registerExtensionShortcuts();
@@ -925,6 +938,22 @@ export class InputController {
 		return true;
 	}
 
+	async handleRetry(): Promise<void> {
+		if (this.ctx.collabGuest) {
+			this.ctx.showStatus("/retry is host-only during a collab session");
+			return;
+		}
+		const didRetry = await this.ctx.viewSession.retry();
+		if (didRetry) {
+			this.ctx.editor.setText("");
+			this.ctx.pendingImages = [];
+			this.ctx.pendingImageLinks = [];
+			this.ctx.editor.imageLinks = undefined;
+		} else {
+			this.ctx.showStatus("Nothing to retry");
+		}
+	}
+
 	/** Send editor text as a follow-up message (queued behind current stream). */
 	async handleFollowUp(): Promise<void> {
 		let text = this.ctx.editor.getText().trim();

package/src/modes/controllers/selector-controller.ts

@@ -3,7 +3,7 @@ import { PASTE_CODE_LOGIN_PROVIDERS } from "@oh-my-pi/pi-ai";
 import { getOAuthProviders } from "@oh-my-pi/pi-ai/oauth";
 import type { OAuthProvider } from "@oh-my-pi/pi-ai/oauth/types";
 import type { Component, OverlayHandle } from "@oh-my-pi/pi-tui";
-import { Input, Loader, Spacer, Text } from "@oh-my-pi/pi-tui";
+import { Input, Loader, Spacer, setTuiTight, Text } from "@oh-my-pi/pi-tui";
 import { getAgentDbPath, getProjectDir, normalizePathForComparison } from "@oh-my-pi/pi-utils";
 import { formatModelSelectorValue } from "../../config/model-resolver";
 import { getRoleInfo } from "../../config/model-roles";
@@ -67,7 +67,6 @@ import { TranscriptBlock } from "../components/transcript-container";
 import { TreeSelectorComponent } from "../components/tree-selector";
 import { UserMessageSelectorComponent } from "../components/user-message-selector";
 import type { SessionObserverRegistry } from "../session-observer-registry";
-import { computeContextBreakdown } from "../utils/context-usage";
 import { buildCopyTargets } from "../utils/copy-targets";
 
 const MANUAL_LOGIN_TIP = "Tip: You can complete pairing with /login <redirect URL>.";
@@ -325,6 +324,13 @@ export class SelectorController {
 					}
 				}
 				break;
+			case "tui.tight":
+				setTuiTight(value as boolean);
+				this.ctx.ui.invalidate();
+				this.ctx.updateEditorTopBorder();
+				this.ctx.ui.requestRender();
+				break;
+
 			case "theme": {
 				setTheme(value as string, true).then(result => {
 					this.ctx.statusLine.invalidate();
@@ -380,6 +386,7 @@ export class SelectorController {
 				this.ctx.session.agent.repetitionPenalty = repetitionPenalty >= 0 ? repetitionPenalty : undefined;
 				break;
 			}
+			case "git.enabled":
 			case "statusLinePreset":
 			case "statusLine.preset":
 			case "statusLineSeparator":
@@ -443,7 +450,7 @@ export class SelectorController {
 	}
 
 	showModelSelector(options?: { temporaryOnly?: boolean }): void {
-		const currentContextTokens = computeContextBreakdown(this.ctx.session).usedTokens;
+		const currentContextTokens = this.ctx.session.getContextUsage()?.tokens ?? 0;
 		this.showSelector(done => {
 			const selector = new ModelSelectorComponent(
 				this.ctx.ui,

package/src/modes/interactive-mode.ts

@@ -30,6 +30,7 @@ import {
 	ProcessTerminal,
 	Spacer,
 	setTerminalTextSizing,
+	setTuiTight,
 	TERMINAL,
 	Text,
 	TUI,
@@ -566,6 +567,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			);
 		}
 
+		setTuiTight(settings.get("tui.tight"));
 		this.ui = new TUI(new ProcessTerminal(), settings.get("showHardwareCursor"));
 		this.ui.setMaxInlineImages(settings.get("tui.maxInlineImages"));
 		// OSC 66 text-sizing is Kitty-only; resolve the setting against the terminal's
@@ -852,14 +854,16 @@ export class InteractiveMode implements InteractiveModeContext {
 			}),
 		);
 		// Set up theme file watcher
-		onThemeChange(() => {
-			this.#clearWorkingMessageAccentCache();
-			clearRenderCache();
-			clearMermaidCache();
-			this.ui.invalidate();
-			this.updateEditorBorderColor();
-			this.ui.requestRender();
-		});
+		this.#eventBusUnsubscribers.push(
+			onThemeChange(() => {
+				this.#clearWorkingMessageAccentCache();
+				clearRenderCache();
+				clearMermaidCache();
+				this.ui.invalidate();
+				this.updateEditorBorderColor();
+				this.ui.requestRender();
+			}),
+		);
 
 		// Subscribe to terminal dark/light appearance changes.
 		// The terminal queries background color via OSC 11 at startup and on
@@ -2179,7 +2183,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	}
 
 	#formatKeepContextLabel(contextUsage: ContextUsage | undefined): string {
-		if (contextUsage?.tokens == null) {
+		if (!contextUsage) {
 			return "Approve and keep context";
 		}
 		const tokens = formatContextTokenCount(contextUsage.tokens);
@@ -2188,7 +2192,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	}
 
 	#isKeepContextDisabled(contextUsage: ContextUsage | undefined): boolean {
-		return contextUsage?.percent != null && contextUsage.percent > PLAN_KEEP_CONTEXT_DISABLE_THRESHOLD_PERCENT;
+		return contextUsage !== undefined && contextUsage.percent > PLAN_KEEP_CONTEXT_DISABLE_THRESHOLD_PERCENT;
 	}
 
 	async #openPlanInExternalEditor(planFilePath: string): Promise<void> {
@@ -3720,6 +3724,34 @@ export class InteractiveMode implements InteractiveModeContext {
 		return this.#btwController.handleEscape();
 	}
 
+	canBranchBtw(): boolean {
+		return this.#btwController.canBranch();
+	}
+
+	handleBtwBranchKey(): Promise<boolean> {
+		return this.#btwController.handleBranch();
+	}
+
+	async handleBtwBranch(question: string, assistantMessage: AssistantMessage): Promise<void> {
+		try {
+			const result = await this.session.branchFromBtw(question, assistantMessage);
+			if (result.cancelled) {
+				this.showStatus("/btw branch cancelled", { dim: true });
+				return;
+			}
+			this.#btwController.dispose();
+			this.#omfgController.dispose();
+			this.chatContainer.clear();
+			this.renderInitialMessages({ clearTerminalHistory: true });
+			this.updateEditorBorderColor();
+			this.showStatus(
+				result.sessionFile ? `Branched /btw to ${path.basename(result.sessionFile)}` : "Branched /btw",
+			);
+		} catch (error) {
+			this.showError(`Cannot branch /btw: ${error instanceof Error ? error.message : String(error)}`);
+		}
+	}
+
 	handleOmfgCommand(complaint: string): Promise<void> {
 		return this.#omfgController.start(complaint);
 	}

package/src/modes/rpc/rpc-types.ts

@@ -108,7 +108,7 @@ export interface RpcSessionState {
 	/** For session dump / export (plain-text parity with /dump). */
 	systemPrompt?: string[];
 	dumpTools?: Array<{ name: string; description: string; parameters: unknown; examples?: readonly ToolExample[] }>;
-	/** Current context window usage. Null tokens/percent when unknown (e.g. right after compaction). */
+	/** Current context window usage. */
 	contextUsage?: ContextUsage;
 }
 

package/src/modes/setup-wizard/index.ts

@@ -9,6 +9,7 @@ import { SetupWizardComponent } from "./wizard-overlay";
 
 export type { SetupScene, SetupSceneController, SetupSceneHost, SetupSceneResult } from "./scenes/types";
 
+export { runStartupSplash } from "./startup-splash";
 export { CURRENT_SETUP_VERSION };
 
 export const ALL_SCENES = [

package/src/modes/setup-wizard/scenes/sign-in.ts

@@ -1,8 +1,16 @@
 import type { AuthStorage } from "@oh-my-pi/pi-ai";
 import { PASTE_CODE_LOGIN_PROVIDERS } from "@oh-my-pi/pi-ai";
 import type { OAuthProvider } from "@oh-my-pi/pi-ai/oauth/types";
-import { Input, matchesKey, type SgrMouseEvent, wrapTextWithAnsi } from "@oh-my-pi/pi-tui";
+import {
+	type Component,
+	type Focusable,
+	Input,
+	matchesKey,
+	type SgrMouseEvent,
+	wrapTextWithAnsi,
+} from "@oh-my-pi/pi-tui";
 import { getAgentDbPath } from "@oh-my-pi/pi-utils";
+import { copyToClipboard } from "../../../utils/clipboard";
 import { OAuthSelectorComponent } from "../../components/oauth-selector";
 import { theme } from "../../theme/theme";
 import type { SetupSceneHost, SetupTab } from "./types";
@@ -11,10 +19,52 @@ function loginUrlLink(url: string): string {
 	return `\x1b]8;;${url}\x07Open login URL\x1b]8;;\x07`;
 }
 
+function loginCopyHint(): string {
+	return theme.fg("dim", "(clipboard copy attempted; Alt+C retries)");
+}
+
+class CopyablePromptInput implements Component, Focusable {
+	#input: Input;
+	#onCopy: () => void;
+
+	constructor(input: Input, onCopy: () => void) {
+		this.#input = input;
+		this.#onCopy = onCopy;
+	}
+
+	get focused(): boolean {
+		return this.#input.focused;
+	}
+
+	set focused(value: boolean) {
+		this.#input.focused = value;
+	}
+
+	setUseTerminalCursor(useTerminalCursor: boolean): void {
+		this.#input.setUseTerminalCursor(useTerminalCursor);
+	}
+
+	render(width: number): readonly string[] {
+		return this.#input.render(width);
+	}
+
+	handleInput(data: string): void {
+		if (matchesKey(data, "alt+c")) {
+			this.#onCopy();
+			return;
+		}
+		this.#input.handleInput(data);
+	}
+
+	invalidate(): void {
+		this.#input.invalidate();
+	}
+}
+
 interface PromptState {
 	message: string;
 	placeholder?: string;
-	input: Input;
+	input: CopyablePromptInput;
 }
 
 /**
@@ -62,6 +112,10 @@ export class SignInTab implements SetupTab {
 
 	handleInput(data: string): void {
 		if (this.#loggingInProvider) {
+			if (this.#authUrl && (matchesKey(data, "alt+c") || (data === "c" && !this.#prompt))) {
+				void this.#copyAuthUrl();
+				return;
+			}
 			if (matchesKey(data, "escape") || matchesKey(data, "ctrl+c")) {
 				this.#loginAbort?.abort();
 			}
@@ -88,7 +142,10 @@ export class SignInTab implements SetupTab {
 
 		const urlLines = this.#authUrl ? wrapTextWithAnsi(theme.fg("dim", this.#authUrl), width) : [];
 		if (this.#authUrl) {
-			lines.push(theme.fg("accent", `Browser login: ${loginUrlLink(this.#authUrl)}`), ...urlLines.slice(0, 2));
+			lines.push(
+				theme.fg("accent", `Browser login: ${loginUrlLink(this.#authUrl)} ${loginCopyHint()}`),
+				...urlLines.slice(0, 2),
+			);
 		}
 		if (this.#prompt) {
 			lines.push(theme.fg("warning", this.#prompt.message));
@@ -140,6 +197,7 @@ export class SignInTab implements SetupTab {
 					if (useManualInput) {
 						this.#statusLines.push(theme.fg("dim", "Paste the returned code or redirect URL when prompted."));
 					}
+					void this.#copyAuthUrl();
 					this.host.ctx.openInBrowser(info.url);
 					this.host.requestRender();
 				},
@@ -184,12 +242,26 @@ export class SignInTab implements SetupTab {
 		}
 	}
 
+	async #copyAuthUrl(): Promise<void> {
+		const url = this.#authUrl;
+		if (!url) return;
+		try {
+			await copyToClipboard(url);
+		} catch {
+			// Clipboard integration is best-effort; the full URL remains rendered below.
+		}
+		this.host.requestRender();
+	}
+
 	#showPrompt(prompt: { message: string; placeholder?: string }): Promise<string> {
 		this.#resolvePrompt("");
 		const input = new Input();
+		const focusInput = new CopyablePromptInput(input, () => {
+			void this.#copyAuthUrl();
+		});
 		const pending = Promise.withResolvers<string>();
 		this.#promptResolve = pending.resolve;
-		this.#prompt = { message: prompt.message, placeholder: prompt.placeholder, input };
+		this.#prompt = { message: prompt.message, placeholder: prompt.placeholder, input: focusInput };
 		input.onSubmit = value => {
 			this.#resolvePrompt(value);
 		};
@@ -197,7 +269,7 @@ export class SignInTab implements SetupTab {
 			this.#loginAbort?.abort();
 			this.#resolvePrompt("");
 		};
-		this.host.setFocus(input);
+		this.host.setFocus(focusInput);
 		this.host.requestRender();
 		return pending.promise;
 	}

package/src/modes/setup-wizard/startup-splash.ts

@@ -0,0 +1,107 @@
+import { type Component, matchesKey, type OverlayFocusOwner } from "@oh-my-pi/pi-tui";
+import type { InteractiveModeContext } from "../types";
+import { renderSetupSplash, SETUP_SPLASH_MS, SETUP_TICK_MS } from "./scenes/splash";
+
+export interface RunStartupSplashOptions {
+	readonly durationMs?: number;
+	readonly tickMs?: number;
+	readonly now?: () => number;
+}
+
+class StartupSplashComponent implements Component, OverlayFocusOwner {
+	#phaseStartedAt = 0;
+	#timer: NodeJS.Timeout | undefined;
+	#done = Promise.withResolvers<void>();
+	#disposed = false;
+	readonly #durationMs: number;
+	readonly #tickMs: number;
+	readonly #now: () => number;
+
+	constructor(
+		readonly ctx: InteractiveModeContext,
+		options: RunStartupSplashOptions = {},
+	) {
+		this.#durationMs = options.durationMs ?? SETUP_SPLASH_MS;
+		this.#tickMs = options.tickMs ?? SETUP_TICK_MS;
+		this.#now = options.now ?? (() => performance.now());
+	}
+
+	run(): Promise<void> {
+		this.#phaseStartedAt = this.#now();
+		this.#startTimer();
+		this.ctx.ui.requestRender();
+		return this.#done.promise;
+	}
+
+	dispose(): void {
+		this.#disposed = true;
+		this.#stopTimer();
+	}
+
+	ownsOverlayFocusTarget(component: Component): boolean {
+		return component === this;
+	}
+
+	handleInput(data: string): void {
+		if (
+			matchesKey(data, "enter") ||
+			matchesKey(data, "return") ||
+			matchesKey(data, "space") ||
+			matchesKey(data, "escape")
+		) {
+			this.#complete();
+		}
+	}
+
+	render(width: number): readonly string[] {
+		const elapsedMs = Math.min(this.#durationMs, Math.max(0, this.#now() - this.#phaseStartedAt));
+		return renderSetupSplash(Math.max(1, width), Math.max(1, this.ctx.ui.terminal.rows), elapsedMs);
+	}
+
+	#startTimer(): void {
+		if (this.#timer) return;
+		this.#timer = setInterval(() => {
+			if (this.#disposed) return;
+			const elapsed = this.#now() - this.#phaseStartedAt;
+			if (elapsed >= this.#durationMs) {
+				this.#complete();
+				return;
+			}
+			this.ctx.ui.requestRender();
+		}, this.#tickMs);
+	}
+
+	#stopTimer(): void {
+		if (!this.#timer) return;
+		clearInterval(this.#timer);
+		this.#timer = undefined;
+	}
+
+	#complete(): void {
+		if (this.#disposed) return;
+		this.#stopTimer();
+		this.#done.resolve();
+	}
+}
+
+export async function runStartupSplash(
+	ctx: InteractiveModeContext,
+	options: RunStartupSplashOptions = {},
+): Promise<void> {
+	const component = new StartupSplashComponent(ctx, options);
+	const overlay = ctx.ui.showOverlay(component, {
+		width: "100%",
+		maxHeight: "100%",
+		anchor: "top-left",
+		margin: 0,
+		fullscreen: true,
+	});
+	try {
+		ctx.ui.setFocus(component);
+		await component.run();
+	} finally {
+		component.dispose();
+		ctx.ui.setFocus(component);
+		overlay.hide();
+	}
+}