@oh-my-pi/pi-coding-agent 13.6.2 → 13.7.0

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+## [13.7.0] - 2026-03-03
+
+### Fixed
+
+- Fixed `ask` timeout handling to auto-select the recommended option instead of aborting the turn, while preserving explicit user-cancel abort behavior ([#266](https://github.com/can1357/oh-my-pi/issues/266))
+
 ## [13.6.2] - 2026-03-03
 ### Fixed
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "13.6.2",
+	"version": "13.7.0",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/can1357/oh-my-pi",
 	"author": "Can Boluk",
@@ -41,12 +41,12 @@
 	},
 	"dependencies": {
 		"@mozilla/readability": "^0.6",
-		"@oh-my-pi/omp-stats": "13.6.2",
-		"@oh-my-pi/pi-agent-core": "13.6.2",
-		"@oh-my-pi/pi-ai": "13.6.2",
-		"@oh-my-pi/pi-natives": "13.6.2",
-		"@oh-my-pi/pi-tui": "13.6.2",
-		"@oh-my-pi/pi-utils": "13.6.2",
+		"@oh-my-pi/omp-stats": "13.7.0",
+		"@oh-my-pi/pi-agent-core": "13.7.0",
+		"@oh-my-pi/pi-ai": "13.7.0",
+		"@oh-my-pi/pi-natives": "13.7.0",
+		"@oh-my-pi/pi-tui": "13.7.0",
+		"@oh-my-pi/pi-utils": "13.7.0",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.18",

package/src/cli/grep-cli.ts

@@ -15,6 +15,7 @@ export interface GrepCommandArgs {
 	limit: number;
 	context: number;
 	mode: "content" | "filesWithMatches" | "count";
+	gitignore: boolean;
 }
 
 /**
@@ -32,6 +33,7 @@ export function parseGrepArgs(args: string[]): GrepCommandArgs | undefined {
 		limit: 20,
 		context: 2,
 		mode: "content",
+		gitignore: true,
 	};
 
 	const positional: string[] = [];
@@ -48,6 +50,8 @@ export function parseGrepArgs(args: string[]): GrepCommandArgs | undefined {
 			result.mode = "filesWithMatches";
 		} else if (arg === "--count" || arg === "-c") {
 			result.mode = "count";
+		} else if (arg === "--no-gitignore") {
+			result.gitignore = false;
 		} else if (!arg.startsWith("-")) {
 			positional.push(arg);
 		}
@@ -72,7 +76,9 @@ export async function runGrepCommand(cmd: GrepCommandArgs): Promise<void> {
 	const searchPath = path.resolve(cmd.path);
 	console.log(chalk.dim(`Searching in: ${searchPath}`));
 	console.log(chalk.dim(`Pattern: ${cmd.pattern}`));
-	console.log(chalk.dim(`Mode: ${cmd.mode}, Limit: ${cmd.limit}, Context: ${cmd.context}`));
+	console.log(
+		chalk.dim(`Mode: ${cmd.mode}, Limit: ${cmd.limit}, Context: ${cmd.context}, Gitignore: ${cmd.gitignore}`),
+	);
 
 	console.log("");
 
@@ -85,6 +91,7 @@ export async function runGrepCommand(cmd: GrepCommandArgs): Promise<void> {
 			maxCount: cmd.limit,
 			context: cmd.mode === "content" ? cmd.context : undefined,
 			hidden: true,
+			gitignore: cmd.gitignore,
 		});
 
 		console.log(chalk.green(`Total matches: ${result.totalMatches}`));
@@ -140,6 +147,7 @@ ${chalk.bold("Options:")}
   -f, --files           Output file names only
   -c, --count           Output match counts per file
   -h, --help            Show this help
+  --no-gitignore        Include files excluded by .gitignore
 
 ${chalk.bold("Environment:")}
   PI_GREP_WORKERS=0    Disable worker pool (use single-threaded mode)

package/src/commands/grep.ts

@@ -19,6 +19,7 @@ export default class Grep extends Command {
 		context: Flags.integer({ char: "C", description: "Context lines", default: 2 }),
 		files: Flags.boolean({ char: "f", description: "Output file names only" }),
 		count: Flags.boolean({ char: "c", description: "Output match counts per file" }),
+		"no-gitignore": Flags.boolean({ description: "Include files excluded by .gitignore" }),
 	};
 
 	async run(): Promise<void> {
@@ -33,6 +34,7 @@ export default class Grep extends Command {
 			limit: flags.limit,
 			context: flags.context,
 			mode,
+			gitignore: !flags["no-gitignore"],
 		};
 
 		await initTheme();

package/src/config/settings-schema.ts

@@ -68,6 +68,7 @@ export type StatusLineSegmentId =
 	| "token_in"
 	| "token_out"
 	| "token_total"
+	| "token_rate"
 	| "cost"
 	| "context_pct"
 	| "context_total"

package/src/extensibility/extensions/types.ts

@@ -70,10 +70,18 @@ export type { AgentToolResult, AgentToolUpdateCallback };
 export interface ExtensionUIDialogOptions {
 	signal?: AbortSignal;
 	timeout?: number;
+	/** Invoked when the UI times out while waiting for a selection/input */
+	onTimeout?: () => void;
 	/** Initial cursor position for select dialogs (0-indexed) */
 	initialIndex?: number;
 	/** Render an outlined list for select dialogs */
 	outline?: boolean;
+	/** Invoked when user presses left arrow in select dialogs */
+	onLeft?: () => void;
+	/** Invoked when user presses right arrow in select dialogs */
+	onRight?: () => void;
+	/** Optional footer hint text rendered by interactive selector */
+	helpText?: string;
 }
 
 /** Raw terminal input listener for extensions. */

package/src/main.ts

@@ -28,7 +28,7 @@ import { InteractiveMode, runPrintMode, runRpcMode } from "./modes";
 import { initTheme, stopThemeWatcher } from "./modes/theme/theme";
 import { type CreateAgentSessionOptions, createAgentSession, discoverAuthStorage } from "./sdk";
 import type { AgentSession } from "./session/agent-session";
-import { type SessionInfo, SessionManager } from "./session/session-manager";
+import { resolveResumableSession, type SessionInfo, SessionManager } from "./session/session-manager";
 import { resolvePromptInput } from "./system-prompt";
 import { getChangelogPath, getNewEntries, parseChangelog } from "./utils/changelog";
 
@@ -162,23 +162,13 @@ async function prepareInitialMessage(
 	};
 }
 
-/**
- * Resolve a session argument to a local or global session match.
- */
-async function resolveSessionMatch(
-	sessionArg: string,
-	cwd: string,
-	sessionDir?: string,
-): Promise<SessionInfo | undefined> {
-	const sessions = await SessionManager.list(cwd, sessionDir);
-	let matches = sessions.filter(session => session.id.startsWith(sessionArg));
-
-	if (matches.length === 0 && !sessionDir) {
-		const globalSessions = await SessionManager.listAll();
-		matches = globalSessions.filter(session => session.id.startsWith(sessionArg));
-	}
-
-	return matches[0];
+function normalizePathForComparison(value: string): string {
+	const resolved = path.resolve(value);
+	let realPath = resolved;
+	try {
+		realPath = realpathSync(resolved);
+	} catch {}
+	return process.platform === "win32" ? realPath.toLowerCase() : realPath;
 }
 
 async function promptForkSession(session: SessionInfo): Promise<boolean> {
@@ -229,20 +219,22 @@ async function createSessionManager(parsed: Args, cwd: string): Promise<SessionM
 		if (sessionArg.includes("/") || sessionArg.includes("\\") || sessionArg.endsWith(".jsonl")) {
 			return await SessionManager.open(sessionArg, parsed.sessionDir);
 		}
-		const match = await resolveSessionMatch(sessionArg, cwd, parsed.sessionDir);
+		const match = await resolveResumableSession(sessionArg, cwd, parsed.sessionDir);
 		if (!match) {
 			throw new Error(`Session "${sessionArg}" not found.`);
 		}
-		const normalizedCwd = path.resolve(cwd);
-		const normalizedMatchCwd = path.resolve(match.cwd || cwd);
-		if (normalizedCwd !== normalizedMatchCwd) {
-			const shouldFork = await promptForkSession(match);
-			if (!shouldFork) {
-				throw new Error(`Session "${sessionArg}" is in another project (${match.cwd}).`);
+		if (match.scope === "global") {
+			const normalizedCwd = normalizePathForComparison(cwd);
+			const normalizedMatchCwd = normalizePathForComparison(match.session.cwd || cwd);
+			if (normalizedCwd !== normalizedMatchCwd) {
+				const shouldFork = await promptForkSession(match.session);
+				if (!shouldFork) {
+					throw new Error(`Session "${sessionArg}" is in another project (${match.session.cwd}).`);
+				}
+				return await SessionManager.forkFrom(match.session.path, cwd, parsed.sessionDir);
 			}
-			return await SessionManager.forkFrom(match.path, cwd, parsed.sessionDir);
 		}
-		return await SessionManager.open(match.path, parsed.sessionDir);
+		return await SessionManager.open(match.session.path, parsed.sessionDir);
 	}
 	if (parsed.continue) {
 		return await SessionManager.continueRecent(cwd, parsed.sessionDir);

package/src/modes/components/countdown-timer.ts

@@ -5,7 +5,9 @@ import type { TUI } from "@oh-my-pi/pi-tui";
 
 export class CountdownTimer {
 	#intervalId: NodeJS.Timeout | undefined;
+	#expireTimeoutId: NodeJS.Timeout | undefined;
 	#remainingSeconds: number;
+	#deadlineMs = 0;
 	readonly #initialMs: number;
 
 	constructor(
@@ -16,25 +18,48 @@ export class CountdownTimer {
 	) {
 		this.#initialMs = timeoutMs;
 		this.#remainingSeconds = Math.ceil(timeoutMs / 1000);
+		this.#start();
+	}
+
+	#calculateRemainingSeconds(now = Date.now()): number {
+		const remainingMs = Math.max(0, this.#deadlineMs - now);
+		return Math.ceil(remainingMs / 1000);
+	}
+
+	#start(): void {
+		const now = Date.now();
+		this.#deadlineMs = now + this.#initialMs;
+		this.#remainingSeconds = this.#calculateRemainingSeconds(now);
 		this.onTick(this.#remainingSeconds);
+		this.tui?.requestRender();
 
-		this.#intervalId = setInterval(() => {
-			this.#remainingSeconds--;
-			this.onTick(this.#remainingSeconds);
-			this.tui?.requestRender();
+		this.#expireTimeoutId = setTimeout(() => {
+			this.dispose();
+			this.onExpire();
+		}, this.#initialMs);
+
+		this.#startInterval();
+	}
 
-			if (this.#remainingSeconds <= 0) {
-				this.dispose();
-				this.onExpire();
+	#startInterval(): void {
+		if (this.#intervalId) {
+			clearInterval(this.#intervalId);
+			this.#intervalId = undefined;
+		}
+		this.#intervalId = setInterval(() => {
+			const remainingSeconds = this.#calculateRemainingSeconds();
+			if (remainingSeconds !== this.#remainingSeconds) {
+				this.#remainingSeconds = remainingSeconds;
+				this.onTick(this.#remainingSeconds);
 			}
+			this.tui?.requestRender();
 		}, 1000);
 	}
 
 	/** Reset the countdown to its initial value */
 	reset(): void {
-		this.#remainingSeconds = Math.ceil(this.#initialMs / 1000);
-		this.onTick(this.#remainingSeconds);
-		this.tui?.requestRender();
+		this.dispose();
+		this.#start();
 	}
 
 	dispose(): void {
@@ -42,5 +67,9 @@ export class CountdownTimer {
 			clearInterval(this.#intervalId);
 			this.#intervalId = undefined;
 		}
+		if (this.#expireTimeoutId) {
+			clearTimeout(this.#expireTimeoutId);
+			this.#expireTimeoutId = undefined;
+		}
 	}
 }

package/src/modes/components/hook-input.ts

@@ -9,6 +9,7 @@ import { DynamicBorder } from "./dynamic-border";
 export interface HookInputOptions {
 	tui?: TUI;
 	timeout?: number;
+	onTimeout?: () => void;
 }
 
 export class HookInputComponent extends Container {
@@ -44,7 +45,10 @@ export class HookInputComponent extends Container {
 				opts.timeout,
 				opts.tui,
 				s => this.#titleText.setText(theme.fg("accent", `${this.#baseTitle} (${s}s)`)),
-				() => this.#onCancelCallback(),
+				() => {
+					opts.onTimeout?.();
+					this.#onCancelCallback();
+				},
 			);
 		}
 
@@ -57,6 +61,8 @@ export class HookInputComponent extends Container {
 	}
 
 	handleInput(keyData: string): void {
+		// Reset countdown on any interaction
+		this.#countdown?.reset();
 		if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
 			this.#onSubmitCallback(this.#input.getValue());
 		} else if (matchesKey(keyData, "escape") || matchesKey(keyData, "esc")) {

package/src/modes/components/hook-selector.ts

@@ -2,7 +2,17 @@
  * Generic selector component for hooks.
  * Displays a list of string options with keyboard navigation.
  */
-import { Container, matchesKey, padding, Spacer, Text, type TUI, visibleWidth } from "@oh-my-pi/pi-tui";
+import {
+	Container,
+	matchesKey,
+	padding,
+	replaceTabs,
+	Spacer,
+	Text,
+	type TUI,
+	truncateToWidth,
+	visibleWidth,
+} from "@oh-my-pi/pi-tui";
 import { theme } from "../../modes/theme/theme";
 import { CountdownTimer } from "./countdown-timer";
 import { DynamicBorder } from "./dynamic-border";
@@ -10,9 +20,13 @@ import { DynamicBorder } from "./dynamic-border";
 export interface HookSelectorOptions {
 	tui?: TUI;
 	timeout?: number;
+	onTimeout?: () => void;
 	initialIndex?: number;
 	outline?: boolean;
 	maxVisible?: number;
+	onLeft?: () => void;
+	onRight?: () => void;
+	helpText?: string;
 }
 
 class OutlinedList extends Container {
@@ -28,8 +42,10 @@ class OutlinedList extends Container {
 		const horizontal = borderColor(theme.boxSharp.horizontal.repeat(Math.max(1, width)));
 		const innerWidth = Math.max(1, width - 2);
 		const content = this.#lines.map(line => {
-			const pad = Math.max(0, innerWidth - visibleWidth(line));
-			return `${borderColor(theme.boxSharp.vertical)}${line}${padding(pad)}${borderColor(theme.boxSharp.vertical)}`;
+			const normalized = replaceTabs(line);
+			const fitted = truncateToWidth(normalized, innerWidth);
+			const pad = Math.max(0, innerWidth - visibleWidth(fitted));
+			return `${borderColor(theme.boxSharp.vertical)}${fitted}${padding(pad)}${borderColor(theme.boxSharp.vertical)}`;
 		});
 		return [horizontal, ...content, horizontal];
 	}
@@ -46,7 +62,8 @@ export class HookSelectorComponent extends Container {
 	#titleText: Text;
 	#baseTitle: string;
 	#countdown: CountdownTimer | undefined;
-
+	#onLeftCallback: (() => void) | undefined;
+	#onRightCallback: (() => void) | undefined;
 	constructor(
 		title: string,
 		options: string[],
@@ -62,6 +79,8 @@ export class HookSelectorComponent extends Container {
 		this.#onSelectCallback = onSelect;
 		this.#onCancelCallback = onCancel;
 		this.#baseTitle = title;
+		this.#onLeftCallback = opts?.onLeft;
+		this.#onRightCallback = opts?.onRight;
 
 		this.addChild(new DynamicBorder());
 		this.addChild(new Spacer(1));
@@ -76,6 +95,7 @@ export class HookSelectorComponent extends Container {
 				opts.tui,
 				s => this.#titleText.setText(theme.fg("accent", `${this.#baseTitle} (${s}s)`)),
 				() => {
+					opts?.onTimeout?.();
 					// Auto-select current option on timeout (typically the first/recommended option)
 					const selected = this.#options[this.#selectedIndex];
 					if (selected) {
@@ -95,7 +115,8 @@ export class HookSelectorComponent extends Container {
 			this.addChild(this.#listContainer);
 		}
 		this.addChild(new Spacer(1));
-		this.addChild(new Text(theme.fg("dim", "up/down navigate  enter select  esc cancel"), 1, 0));
+		const controlsHint = opts?.helpText ?? "up/down navigate  enter select  esc cancel";
+		this.addChild(new Text(theme.fg("dim", controlsHint), 1, 0));
 		this.addChild(new Spacer(1));
 		this.addChild(new DynamicBorder());
 
@@ -144,6 +165,10 @@ export class HookSelectorComponent extends Container {
 		} else if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
 			const selected = this.#options[this.#selectedIndex];
 			if (selected) this.#onSelectCallback(selected);
+		} else if (matchesKey(keyData, "left")) {
+			this.#onLeftCallback?.();
+		} else if (matchesKey(keyData, "right")) {
+			this.#onRightCallback?.();
 		} else if (matchesKey(keyData, "escape") || matchesKey(keyData, "esc") || matchesKey(keyData, "ctrl+c")) {
 			this.#onCancelCallback();
 		}

package/src/modes/components/mcp-add-wizard.ts

@@ -13,9 +13,11 @@ import {
 	TruncatedText,
 	truncateToWidth,
 } from "@oh-my-pi/pi-tui";
+import { getMCPConfigPath, getProjectDir } from "@oh-my-pi/pi-utils";
 import { validateServerName } from "../../mcp/config-writer";
 import { analyzeAuthError, discoverOAuthEndpoints } from "../../mcp/oauth-discovery";
 import type { MCPHttpServerConfig, MCPServerConfig, MCPSseServerConfig, MCPStdioServerConfig } from "../../mcp/types";
+import { shortenPath } from "../../tools/render-utils";
 import { theme } from "../theme/theme";
 import { DynamicBorder } from "./dynamic-border";
 
@@ -367,9 +369,13 @@ export class MCPAddWizard extends Container {
 		this.#contentContainer.addChild(new Text(theme.fg("accent", "Step: Configuration Scope")));
 		this.#contentContainer.addChild(new Spacer(1));
 
+		const cwd = getProjectDir();
+
+		const userPathLabel = shortenPath(getMCPConfigPath("user", cwd));
+		const projectPathLabel = shortenPath(getMCPConfigPath("project", cwd));
 		const options = [
-			{ value: "user" as const, label: "User level (~/.omp/mcp.json)" },
-			{ value: "project" as const, label: "Project level (.omp/mcp.json)" },
+			{ value: "user" as const, label: `User level (${userPathLabel})` },
+			{ value: "project" as const, label: `Project level (${projectPathLabel})` },
 		];
 
 		for (let i = 0; i < options.length; i++) {

package/src/modes/components/status-line/presets.ts

@@ -2,7 +2,6 @@ import type { PresetDef, StatusLinePreset } from "./types";
 
 export const STATUS_LINE_PRESETS: Record<StatusLinePreset, PresetDef> = {
 	default: {
-		// Matches current behavior
 		leftSegments: ["pi", "model", "plan_mode", "path", "git", "pr", "context_pct", "token_total", "cost"],
 		rightSegments: [],
 		separator: "powerline-thin",
@@ -35,7 +34,7 @@ export const STATUS_LINE_PRESETS: Record<StatusLinePreset, PresetDef> = {
 
 	full: {
 		leftSegments: ["pi", "hostname", "model", "plan_mode", "path", "git", "pr", "subagents"],
-		rightSegments: ["token_in", "token_out", "cache_read", "cost", "context_pct", "time_spent", "time"],
+		rightSegments: ["token_in", "token_out", "token_rate", "cache_read", "cost", "context_pct", "time_spent", "time"],
 		separator: "powerline",
 		segmentOptions: {
 			model: { showThinkingLevel: true },
@@ -53,6 +52,7 @@ export const STATUS_LINE_PRESETS: Record<StatusLinePreset, PresetDef> = {
 			"token_out",
 			"cache_read",
 			"cache_write",
+			"token_rate",
 			"cost",
 			"context_pct",
 			"context_total",

package/src/modes/components/status-line/segments.ts

@@ -203,6 +203,17 @@ const tokenTotalSegment: StatusLineSegment = {
 	},
 };
 
+const tokenRateSegment: StatusLineSegment = {
+	id: "token_rate",
+	render(ctx) {
+		const { tokensPerSecond } = ctx.usageStats;
+		if (!tokensPerSecond) return { content: "", visible: false };
+
+		const content = withIcon(theme.icon.output, `${tokensPerSecond.toFixed(1)}/s`);
+		return { content: theme.fg("statusLineOutput", content), visible: true };
+	},
+};
+
 const costSegment: StatusLineSegment = {
 	id: "cost",
 	render(ctx) {
@@ -351,6 +362,7 @@ export const SEGMENTS: Record<StatusLineSegmentId, StatusLineSegment> = {
 	token_in: tokenInSegment,
 	token_out: tokenOutSegment,
 	token_total: tokenTotalSegment,
+	token_rate: tokenRateSegment,
 	cost: costSegment,
 	context_pct: contextPctSegment,
 	context_total: contextTotalSegment,

package/src/modes/components/status-line/token-rate.ts

@@ -0,0 +1,66 @@
+const MIN_DURATION_MS = 100;
+
+type AssistantUsage = {
+	output: number;
+};
+
+type AssistantLikeMessage = {
+	role: "assistant";
+	timestamp: number;
+	duration?: number;
+	usage: AssistantUsage;
+};
+
+type MaybeAssistantMessage = {
+	role?: string;
+	timestamp?: number;
+	duration?: number;
+	usage?: {
+		output?: number;
+	};
+};
+
+function isAssistantMessage(message: MaybeAssistantMessage | undefined): message is AssistantLikeMessage {
+	return (
+		message?.role === "assistant" &&
+		typeof message.timestamp === "number" &&
+		message.usage !== undefined &&
+		typeof message.usage.output === "number"
+	);
+}
+
+function getLastAssistantMessage(messages: ReadonlyArray<MaybeAssistantMessage>): AssistantLikeMessage | null {
+	for (let i = messages.length - 1; i >= 0; i--) {
+		const message = messages[i];
+		if (isAssistantMessage(message)) {
+			return message;
+		}
+	}
+	return null;
+}
+
+export function calculateTokensPerSecond(
+	messages: ReadonlyArray<MaybeAssistantMessage>,
+	isStreaming: boolean,
+	nowMs: number = Date.now(),
+): number | null {
+	const assistant = getLastAssistantMessage(messages);
+	if (!assistant) return null;
+
+	const outputTokens = assistant.usage.output;
+	if (!Number.isFinite(outputTokens) || outputTokens <= 0) return null;
+
+	const resolvedDurationMs =
+		typeof assistant.duration === "number" && Number.isFinite(assistant.duration) && assistant.duration > 0
+			? assistant.duration
+			: isStreaming
+				? nowMs - assistant.timestamp
+				: null;
+
+	if (resolvedDurationMs === null || resolvedDurationMs < MIN_DURATION_MS) return null;
+
+	const tokensPerSecond = (outputTokens * 1000) / resolvedDurationMs;
+	if (!Number.isFinite(tokensPerSecond) || tokensPerSecond <= 0) return null;
+
+	return tokensPerSecond;
+}

package/src/modes/components/status-line/types.ts

@@ -32,6 +32,7 @@ export interface SegmentContext {
 		cacheWrite: number;
 		premiumRequests: number;
 		cost: number;
+		tokensPerSecond: number | null;
 	};
 	contextPercent: number;
 	contextWindow: number;

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

@@ -25,6 +25,7 @@ const SEGMENT_INFO: Record<StatusLineSegmentId, { label: string; short: string }
 	token_in: { label: "Tokens In", short: "input tokens" },
 	token_out: { label: "Tokens Out", short: "output tokens" },
 	token_total: { label: "Tokens", short: "total tokens" },
+	token_rate: { label: "Tokens/s", short: "output throughput" },
 	cost: { label: "Cost", short: "session cost" },
 	context_pct: { label: "Context %", short: "context usage" },
 	context_total: { label: "Context", short: "context window" },

package/src/modes/components/status-line.ts

@@ -18,6 +18,7 @@ import {
 import { getPreset } from "./status-line/presets";
 import { renderSegment, type SegmentContext } from "./status-line/segments";
 import { getSeparator } from "./status-line/separators";
+import { calculateTokensPerSecond } from "./status-line/token-rate";
 
 export interface StatusLineSegmentOptions {
 	model?: { showThinkingLevel?: boolean };
@@ -65,6 +66,8 @@ export class StatusLineComponent implements Component {
 	#cachedPrContext: PrCacheContext | undefined = undefined;
 	#prLookupInFlight = false;
 	#defaultBranch?: string;
+	#lastTokensPerSecond: number | null = null;
+	#lastTokensPerSecondTimestamp: number | null = null;
 
 	constructor(private readonly session: AgentSession) {
 		this.#settings = {
@@ -309,11 +312,41 @@ export class StatusLineComponent implements Component {
 		return null;
 	}
 
+	#getTokensPerSecond(): number | null {
+		let lastAssistantTimestamp: number | null = null;
+		for (let i = this.session.state.messages.length - 1; i >= 0; i--) {
+			const message = this.session.state.messages[i];
+			if (message?.role === "assistant") {
+				lastAssistantTimestamp = message.timestamp;
+				break;
+			}
+		}
+
+		if (lastAssistantTimestamp === null) {
+			this.#lastTokensPerSecond = null;
+			this.#lastTokensPerSecondTimestamp = null;
+			return null;
+		}
+
+		const rate = calculateTokensPerSecond(this.session.state.messages, this.session.isStreaming);
+		if (rate !== null) {
+			this.#lastTokensPerSecond = rate;
+			this.#lastTokensPerSecondTimestamp = lastAssistantTimestamp;
+			return rate;
+		}
+
+		if (this.#lastTokensPerSecondTimestamp === lastAssistantTimestamp) {
+			return this.#lastTokensPerSecond;
+		}
+
+		return null;
+	}
+
 	#buildSegmentContext(width: number): SegmentContext {
 		const state = this.session.state;
 
 		// Get usage statistics
-		const usageStats = this.session.sessionManager?.getUsageStatistics() ?? {
+		const aggregateUsageStats = this.session.sessionManager?.getUsageStatistics() ?? {
 			input: 0,
 			output: 0,
 			cacheRead: 0,
@@ -321,6 +354,10 @@ export class StatusLineComponent implements Component {
 			premiumRequests: 0,
 			cost: 0,
 		};
+		const usageStats = {
+			...aggregateUsageStats,
+			tokensPerSecond: this.#getTokensPerSecond(),
+		};
 
 		// Get context percentage
 		const lastAssistantMessage = state.messages