@oh-my-pi/pi-tui 18.2.7 → 18.2.9

package/src/overlays/usage-dashboard.ts

@@ -10,7 +10,12 @@ import { resolveUsedFraction, type UsageLimit, type UsageReport } from "@oh-my-p
 import { type Component, matchesKey, replaceTabs, routeSgrMouseInput, truncateToWidth, visibleWidth } from "../index";
 import { colorLuma, formatDuration, hexToRgb, rgbToHex, sanitizeText } from "@oh-my-pi/pi-utils";
 import { formatProviderName } from "../chrome/format";
-import { collapseSharedUsageReports, formatLimitTitle } from "./usage-display";
+import {
+	collapseSharedUsageReports,
+	formatLimitTitle,
+	summarizeUsageResetCredits,
+	type UsageResetSummary,
+} from "./usage-display";
 import { colorToAnsi } from "../theme/color";
 import { ensureThemeSync, theme } from "../theme/theme";
 import { formatAbsoluteOnlyAmount } from "../prompt/usage-amounts";
@@ -61,6 +66,12 @@ export interface ProviderCard {
 	unlimited: boolean;
 	/** True when nothing is used anywhere (or there are no limits): collapses to a tick. */
 	idle: boolean;
+	resetCredits?: {
+		bankedCount: number;
+		redeemableCount: number;
+		soonestExpiryMs?: number;
+		unavailableReasons: string[];
+	};
 }
 
 /**
@@ -152,13 +163,43 @@ export function buildProviderCards(reports: UsageReport[], nowMs: number): Provi
 			if (!duplicated) window.windowTag = undefined;
 		}
 
+		const resetRows = providerReports
+			.map(report => summarizeUsageResetCredits(report.resetCredits, nowMs))
+			.filter((summary): summary is UsageResetSummary => summary !== undefined && summary.bankedCount > 0);
+		const bankedCount = resetRows.reduce((total, summary) => total + summary.bankedCount, 0);
+		const redeemableCount = resetRows.reduce((total, summary) => total + summary.redeemableCount, 0);
+		const resetExpiries = resetRows
+			.map(summary => summary.soonestExpiry)
+			.filter((expiry): expiry is string => expiry !== undefined)
+			.map(expiry => Date.parse(expiry))
+			.filter(Number.isFinite)
+			.sort((left, right) => left - right);
+		const soonestResetExpiry = resetExpiries.find(expiry => expiry > nowMs) ?? resetExpiries.at(-1);
+		const unavailableReasons = [
+			...new Set(
+				resetRows
+					.map(summary => summary.unavailableReason)
+					.filter((reason): reason is string => reason !== undefined),
+			),
+		];
+		const resetCredits =
+			bankedCount > 0
+				? {
+						bankedCount,
+						redeemableCount,
+						soonestExpiryMs: soonestResetExpiry === undefined ? undefined : soonestResetExpiry - nowMs,
+						unavailableReasons,
+					}
+				: undefined;
 		cards.push({
 			provider,
 			name: formatProviderName(provider),
 			accounts: providerReports.length,
 			windows,
 			unlimited: windows.length === 0,
-			idle: windows.every(window => window.fraction !== undefined && window.fraction < IDLE_FRACTION),
+			idle:
+				!resetCredits && windows.every(window => window.fraction !== undefined && window.fraction < IDLE_FRACTION),
+			resetCredits,
 		});
 	}
 
@@ -391,6 +432,25 @@ export class UsageDashboardComponent implements Component {
 		const titlePad = Math.max(0, width - 2 - visibleWidth(title) - visibleWidth(accountsText));
 		lines.push(`${this.#statusIcon(cardStatus)} ${title}${" ".repeat(titlePad)}${accountsText}`);
 
+		if (card.resetCredits) {
+			const resets = card.resetCredits;
+			let resetText = `✦ ${resets.bankedCount} reset${resets.bankedCount === 1 ? "" : "s"}`;
+			if (resets.redeemableCount !== resets.bankedCount) {
+				resetText += ` · ${resets.redeemableCount} usable`;
+			}
+			if (resets.soonestExpiryMs !== undefined) {
+				resetText +=
+					resets.soonestExpiryMs > 0 ? ` · expires ${formatDuration(resets.soonestExpiryMs)}` : " · expired";
+			}
+			lines.push(
+				`  ${theme.fg(resets.redeemableCount > 0 ? "success" : "warning", truncateToWidth(resetText, width - 2))}`,
+			);
+			if (resets.redeemableCount === 0 && resets.unavailableReasons.length > 0) {
+				const reason = sanitizeText(resets.unavailableReasons.join(" • ").replace(/[\r\n\t]+/g, " "));
+				lines.push(`  ${theme.fg("dim", truncateToWidth(`unavailable: ${reason}`, width - 2))}`);
+			}
+		}
+
 		if (card.unlimited) {
 			lines.push(`  ${theme.fg("dim", "no limits")}`);
 			return lines;

package/src/overlays/usage-display.ts

@@ -1,4 +1,4 @@
-import type { UsageLimit, UsageReport } from "@oh-my-pi/pi-ai";
+import type { UsageLimit, UsageReport, UsageResetCredits } from "@oh-my-pi/pi-ai";
 
 /** Include the usage tier in a limit title unless its label already names it. */
 export function formatLimitTitle(limit: UsageLimit): string {
@@ -27,6 +27,79 @@ function collapseSharedLimits(limits: UsageLimit[]): UsageLimit[] {
 	return collapsed ?? limits;
 }
 
+/** Human-readable quota scope for a normalized saved-reset window ID. */
+export function formatUsageResetWindow(windowId: string): string {
+	switch (windowId) {
+		case "anthropic:5h":
+			return "Claude 5h";
+		case "anthropic:7d":
+			return "Claude weekly";
+		case "anthropic:7d:opus":
+			return "Claude Opus weekly";
+		case "anthropic:7d:sonnet":
+			return "Claude Sonnet weekly";
+		default:
+			return windowId;
+	}
+}
+
+/** Saved inventory and current eligibility shared by every usage display. */
+export interface UsageResetSummary {
+	bankedCount: number;
+	redeemableCount: number;
+	soonestExpiry?: string;
+	unavailableReason?: string;
+}
+
+/**
+ * Normalize old count-only and current provider reset metadata for display.
+ * `availableCount` is banked inventory; `redeemableCount` is the subset that
+ * may be spent now. Older providers used `availableCount` for both.
+ */
+export function summarizeUsageResetCredits(
+	reset: UsageResetCredits | undefined,
+	nowMs = Date.now(),
+): UsageResetSummary | undefined {
+	if (!reset) return undefined;
+	const bankedCount = Math.max(0, Math.trunc(reset.availableCount));
+	const redeemableCount = Math.max(0, Math.trunc(reset.redeemableCount ?? reset.availableCount));
+	let soonestExpiry: string | undefined;
+	let soonestExpiryMs = Number.POSITIVE_INFINITY;
+	let latestExpired: string | undefined;
+	let latestExpiredMs = Number.NEGATIVE_INFINITY;
+	for (const credit of reset.credits ?? []) {
+		if (!credit.expiresAt || credit.remainingCount === 0 || credit.status === "redeemed") continue;
+		const expiryMs = Date.parse(credit.expiresAt);
+		if (!Number.isFinite(expiryMs)) continue;
+		if (expiryMs > nowMs && expiryMs < soonestExpiryMs) {
+			soonestExpiryMs = expiryMs;
+			soonestExpiry = credit.expiresAt;
+		} else if (expiryMs <= nowMs && expiryMs > latestExpiredMs) {
+			latestExpiredMs = expiryMs;
+			latestExpired = credit.expiresAt;
+		}
+	}
+	soonestExpiry ??= latestExpired;
+	const selectedCredit = reset.nextCreditId
+		? reset.credits?.find(credit => credit.id === reset.nextCreditId)
+		: (reset.credits?.find(credit => credit.usable !== false) ?? reset.credits?.[0]);
+	const unavailableReason =
+		reset.reason ??
+		(reset.cooldownUntil ? `cooldown until ${reset.cooldownUntil}` : undefined) ??
+		(selectedCredit?.blocking?.length
+			? `blocked by ${selectedCredit.blocking.map(formatUsageResetWindow).join(", ")}`
+			: undefined) ??
+		(selectedCredit?.status && selectedCredit.status !== "available" ? selectedCredit.status : undefined) ??
+		(reset.eligible === false ? "not eligible" : undefined) ??
+		(bankedCount > 0 && redeemableCount === 0 ? "not usable right now" : undefined);
+	return {
+		bankedCount,
+		redeemableCount,
+		soonestExpiry,
+		unavailableReason,
+	};
+}
+
 /** Collapse routing-specific copies of a shared quota for user-facing usage views. */
 export function collapseSharedUsageReports(reports: UsageReport[]): UsageReport[] {
 	let collapsed: UsageReport[] | undefined;

package/src/prompt/custom-editor.ts

@@ -9,7 +9,8 @@ import { TUI } from "../tui";
 import type { AppKeybinding } from "../app-keybindings";
 import { allowsModelMentions, allowsSkillTokens, SKILL_TOKEN_RE } from "./skill-tokens";
 import { expandModelMentionTags, MODEL_MENTION_RE, modelMentionToken } from "./model-mention-syntax";
-import { isVideoPath, videoPreviewSource } from "./video";
+import { imageAttachmentSource } from "./image-source";
+import { isVideoPath } from "./video";
 import {
 	attachmentSgr,
 	COMPOSER_TOKEN_REGEX,
@@ -711,7 +712,7 @@ export class CustomEditor extends Editor {
 		if (!materialize || images.length === 0) return;
 		const links = await materialize(images);
 		if (!links || this.pendingImages !== images) return;
-		this.pendingImageLinks = images.map((image, index) => videoPreviewSource(image) ?? links[index]);
+		this.pendingImageLinks = images.map((image, index) => imageAttachmentSource(image)?.path ?? links[index]);
 		this.imageLinks = this.pendingImageLinks;
 		this.#requestShimmerRepaint?.();
 	}

package/src/prompt/image-source.ts

@@ -0,0 +1,51 @@
+/**
+ * Original filesystem source carried on image attachments that entered from a
+ * file on disk: path-pasted/drag-and-dropped images and generated video
+ * contact-sheet previews. Symbol metadata stays out of serialized/model-bound
+ * image data while traveling with the draft object, until AgentSession creates
+ * the hidden companion message that tells the model the path (and link
+ * materialization prefers it over a blob copy).
+ */
+import type { ImageContent } from "@oh-my-pi/pi-ai";
+import { isRecord } from "@oh-my-pi/pi-utils";
+
+/** How an image attachment's backing file entered the session. */
+export type ImageAttachmentSourceKind = "image" | "video";
+
+/** Original local file backing an image attachment. */
+export interface ImageAttachmentSource {
+	readonly path: string;
+	readonly kind: ImageAttachmentSourceKind;
+}
+
+const kImageAttachmentSource = Symbol("image.attachmentSource");
+
+/** An image attachment tagged with the original local file it came from. */
+export type SourceTaggedImage = ImageContent & {
+	readonly [kImageAttachmentSource]: ImageAttachmentSource;
+};
+
+/** Create a model-ready image tagged with the local file it was loaded from. */
+export function tagImageAttachmentSource(
+	image: ImageContent,
+	path: string,
+	kind: ImageAttachmentSourceKind,
+): SourceTaggedImage {
+	return {
+		type: "image",
+		data: image.data,
+		mimeType: image.mimeType,
+		[kImageAttachmentSource]: { path, kind },
+	};
+}
+
+function isImageAttachmentSource(value: unknown): value is ImageAttachmentSource {
+	return isRecord(value) && typeof value.path === "string" && (value.kind === "image" || value.kind === "video");
+}
+
+/** Return the original local source of an image attachment, or undefined for payloads with no source file (clipboard bitmaps). */
+export function imageAttachmentSource(image: ImageContent): ImageAttachmentSource | undefined {
+	if (!(kImageAttachmentSource in image)) return undefined;
+	const source = image[kImageAttachmentSource];
+	return isImageAttachmentSource(source) ? source : undefined;
+}

package/src/prompt/video.ts

@@ -1,5 +1,6 @@
 import * as path from "node:path";
 import type { ImageContent } from "@oh-my-pi/pi-ai";
+import { type SourceTaggedImage, imageAttachmentSource, tagImageAttachmentSource } from "./image-source";
 
 /** Container extensions treated as video. Mirrors the video subset of the local-protocol binary list. */
 const VIDEO_EXTENSION_LOOKUP: Record<string, true> = {
@@ -17,31 +18,20 @@ export function isVideoPath(filePath: string): boolean {
 	return VIDEO_EXTENSION_LOOKUP[path.extname(filePath).toLowerCase()] === true;
 }
 
-/**
- * Original local source path stored on a generated contact-sheet image. Symbol
- * metadata stays out of serialized/model-bound image data while traveling with
- * the draft object until AgentSession creates its hidden companion message.
- */
-const kVideoPreviewSource = Symbol("video.previewSource");
-
 /** A contact-sheet image tagged with the original local video path. */
-export type VideoPreviewImage = ImageContent & {
-	readonly [kVideoPreviewSource]: string;
-};
+export type VideoPreviewImage = SourceTaggedImage;
 
 /** Create a model-ready contact-sheet image tagged with its original video path. */
 export function createVideoPreviewImage(preview: ImageContent, sourcePath: string): VideoPreviewImage {
-	return {
-		type: "image",
-		data: preview.data,
-		mimeType: preview.mimeType,
-		[kVideoPreviewSource]: sourcePath,
-	};
+	return tagImageAttachmentSource(preview, sourcePath, "video");
 }
 
-/** Return the original video path associated with a generated contact-sheet image. */
+/**
+ * Return the original video path associated with a generated contact-sheet
+ * image, via the shared attachment-source tag (see {@link tagImageAttachmentSource}).
+ * Returns undefined for untagged images and for image-file (non-video) sources.
+ */
 export function videoPreviewSource(preview: ImageContent): string | undefined {
-	if (!(kVideoPreviewSource in preview)) return undefined;
-	const sourcePath = preview[kVideoPreviewSource];
-	return typeof sourcePath === "string" ? sourcePath : undefined;
+	const source = imageAttachmentSource(preview);
+	return source?.kind === "video" ? source.path : undefined;
 }

package/src/status-line/component.ts

@@ -35,6 +35,7 @@ import {
 	detectCodexResetFireworks,
 } from "../overlays/codex-reset-fireworks";
 import { canReuseCachedPr, createPrCacheContext, isSamePrCacheContext, type PrCacheContext } from "./git-utils";
+import { summarizeUsageResetCredits } from "../overlays/usage-display";
 import { getPreset } from "./presets";
 import { renderSegment, type SegmentContext } from "./segments";
 import { getSeparator } from "./separators";
@@ -79,7 +80,7 @@ function normalizeUsageScopeValue(value: unknown): string | undefined {
  * be present and equal or a workspace sibling can mutate this account's
  * baseline.
  */
-function codexReportMatchesExactIdentity(report: UsageReport, identity: OAuthAccountIdentity | undefined): boolean {
+function reportMatchesExactIdentity(report: UsageReport, identity: OAuthAccountIdentity | undefined): boolean {
 	if (!identity) return false;
 	const accountId = normalizeUsageScopeValue(identity.accountId);
 	const email = normalizeUsageScopeValue(identity.email);
@@ -567,6 +568,13 @@ export class StatusLineComponent<TSession extends StatusLineSession = StatusLine
 		daily?: { percent: number; resetMinutes?: number };
 		sevenDay?: { percent: number; resetHours?: number };
 		monthly?: { percent: number; resetHours?: number };
+		resetCredits?: {
+			bankedCount: number;
+			redeemableCount: number;
+			expiryHours?: number;
+			expired?: boolean;
+			unavailableReason?: string;
+		};
 	} | null = null;
 	#cachedUsageContextKey: string | null = null;
 	#usageFetchedAt = 0;
@@ -1756,7 +1764,7 @@ export class StatusLineComponent<TSession extends StatusLineSession = StatusLine
 			// The report boundary above validates the fields this extractor iterates;
 			// optional metadata and credit fields are narrowed again before use.
 			const usageReport = report as UsageReport;
-			if (!codexReportMatchesExactIdentity(usageReport, activeIdentity)) continue;
+			if (!reportMatchesExactIdentity(usageReport, activeIdentity)) continue;
 			matchingReport = usageReport;
 			break;
 		}
@@ -1812,9 +1820,17 @@ export class StatusLineComponent<TSession extends StatusLineSession = StatusLine
 		daily?: { percent: number; resetMinutes?: number };
 		sevenDay?: { percent: number; resetHours?: number };
 		monthly?: { percent: number; resetHours?: number };
+		resetCredits?: {
+			bankedCount: number;
+			redeemableCount: number;
+			expiryHours?: number;
+			expired?: boolean;
+			unavailableReason?: string;
+		};
 	} | null {
 		if (!Array.isArray(reports)) return null;
 		const now = Date.now();
+		const resetReports: UsageReport[] = [];
 		const activeModelId = normalizeUsageScopeValue(context.modelId);
 		const activeAntigravityCounter =
 			context.provider === "google-antigravity" ? getAntigravityCounterKeyForModel(context.modelId) : undefined;
@@ -1828,6 +1844,12 @@ export class StatusLineComponent<TSession extends StatusLineSession = StatusLine
 			// fetchUsageReports supplies normalized rows; the guards above protect
 			// the unknown session boundary before the account matcher reads metadata.
 			const usageReport = report as UsageReport;
+			if (
+				usageReport.resetCredits &&
+				(!context.identity || reportMatchesExactIdentity(usageReport, context.identity))
+			) {
+				resetReports.push(usageReport);
+			}
 			const limits =
 				provider === "google-antigravity" && activeAntigravityCounter
 					? scopeAntigravityLimitsForModel(usageReport, context)
@@ -1915,7 +1937,28 @@ export class StatusLineComponent<TSession extends StatusLineSession = StatusLine
 		for (const group of scopeGroups.values()) {
 			if (!selectedGroup || group.priority < selectedGroup.priority) selectedGroup = group;
 		}
-		if (!selectedGroup) return null;
+		const resetReport =
+			resetReports.length === 1
+				? resetReports[0]
+				: context.identity
+					? resetReports.find(report => reportMatchesExactIdentity(report, context.identity))
+					: undefined;
+		const resetSummary = summarizeUsageResetCredits(resetReport?.resetCredits, now);
+		const resetExpiryMs = resetSummary?.soonestExpiry ? Date.parse(resetSummary.soonestExpiry) - now : undefined;
+		const resetCredits =
+			resetSummary && resetSummary.bankedCount > 0
+				? {
+						bankedCount: resetSummary.bankedCount,
+						redeemableCount: resetSummary.redeemableCount,
+						expiryHours:
+							resetExpiryMs !== undefined && resetExpiryMs > 0
+								? Math.max(1, Math.ceil(resetExpiryMs / 3_600_000))
+								: undefined,
+						expired: resetExpiryMs !== undefined && resetExpiryMs <= 0,
+						unavailableReason: resetSummary.unavailableReason,
+					}
+				: undefined;
+		if (!selectedGroup) return resetCredits ? { resetCredits } : null;
 
 		let fiveHour: { percent: number; resetMinutes?: number } | undefined;
 		let daily: { percent: number; resetMinutes?: number } | undefined;
@@ -1972,8 +2015,8 @@ export class StatusLineComponent<TSession extends StatusLineSession = StatusLine
 				}
 			}
 		}
-		if (!fiveHour && !daily && !sevenDay && !monthly) return null;
-		return { tier: selectedGroup.tier, fiveHour, daily, sevenDay, monthly };
+		if (!fiveHour && !daily && !sevenDay && !monthly && !resetCredits) return null;
+		return { tier: selectedGroup.tier, fiveHour, daily, sevenDay, monthly, resetCredits };
 	}
 
 	/**

package/src/status-line/segments.ts

@@ -859,7 +859,7 @@ const usageSegment: StatusLineSegment = {
 	id: "usage",
 	render(ctx) {
 		const u = ctx.usage;
-		if (!u || (!u.fiveHour && !u.daily && !u.sevenDay && !u.monthly)) {
+		if (!u || (!u.fiveHour && !u.daily && !u.sevenDay && !u.monthly && !u.resetCredits)) {
 			return { content: "", visible: false };
 		}
 		const parts: string[] = [];
@@ -884,6 +884,23 @@ const usageSegment: StatusLineSegment = {
 			// "1% used"; OpenCode's endpoint already emits floored integers).
 			parts.push(formatQuotaWindow(ctx, "mo", u.monthly.percent, u.monthly.resetHours, "h", "floor"));
 		}
+		if (u.resetCredits) {
+			const resets = u.resetCredits;
+			let resetText = `✦ ${resets.bankedCount}`;
+			if (resets.redeemableCount !== resets.bankedCount) {
+				resetText += ` (${resets.redeemableCount} usable)`;
+			}
+			if (resets.expiryHours !== undefined) {
+				resetText += ` exp ${formatUsageReset(resets.expiryHours, "h")}`;
+			} else if (resets.expired) {
+				resetText += " expired";
+			}
+			if (resets.redeemableCount === 0 && resets.unavailableReason) {
+				const reason = truncateToWidth(sanitizeStatusText(resets.unavailableReason), TRUNCATE_LENGTHS.SHORT);
+				if (reason) resetText += ` ${reason}`;
+			}
+			parts.push(theme.fg(resets.redeemableCount > 0 ? "success" : "warning", resetText));
+		}
 		const content = withIcon(theme.icon.time, parts.join(theme.sep.dot));
 		return { content, visible: true };
 	},

package/src/status-line/types.ts

@@ -188,6 +188,13 @@ export interface SegmentContext {
 		daily?: { percent: number; resetMinutes?: number };
 		sevenDay?: { percent: number; resetHours?: number };
 		monthly?: { percent: number; resetHours?: number };
+		resetCredits?: {
+			bankedCount: number;
+			redeemableCount: number;
+			expiryHours?: number;
+			expired?: boolean;
+			unavailableReason?: string;
+		};
 	} | null;
 }
 

package/src/stdin-buffer.ts

@@ -423,6 +423,12 @@ export class StdinBuffer extends EventEmitter<StdinBufferEventMap> {
 	#escapeSearchOffset = 0;
 	#rawPasteCandidate = "";
 	#rawPasteTimer?: NodeJS.Timeout;
+	// Unbracketed raw-paste classification is a fallback for terminals that do
+	// not wrap pastes in DECSET 2004 markers. When the terminal confirms mode
+	// 2004 support, a genuine paste always arrives bracketed, so the heuristic
+	// can only misfire on keystrokes an event-loop stall batched into one read
+	// (issue #12540) — Terminal disables it via `setRawPasteClassification`.
+	#rawPasteClassificationEnabled = true;
 	#stringDiscardActive = false;
 	#stringDiscardBytes = 0;
 	#stringDiscardEscHeld = false;
@@ -492,6 +498,7 @@ export class StdinBuffer extends EventEmitter<StdinBufferEventMap> {
 		}
 
 		if (
+			this.#rawPasteClassificationEnabled &&
 			this.#buffer.length === 0 &&
 			str.indexOf(ESC) === -1 &&
 			(str.indexOf("\r") !== -1 || str.indexOf("\n") !== -1)
@@ -641,6 +648,21 @@ export class StdinBuffer extends EventEmitter<StdinBufferEventMap> {
 		this.emit("paste", content);
 	}
 
+	/**
+	 * Enable or disable unbracketed raw-paste classification. Terminal disables
+	 * it once DECRQM confirms bracketed-paste (mode 2004) support: a genuine
+	 * paste then always arrives wrapped, so the heuristic can only misfire on
+	 * keystrokes an event-loop stall batched into one read (issue #12540).
+	 * Disabling flushes any candidate already held by the classification window
+	 * as ordinary key events so no buffered input is lost.
+	 */
+	setRawPasteClassification(enabled: boolean): void {
+		this.#rawPasteClassificationEnabled = enabled;
+		if (!enabled && this.#rawPasteCandidate.length > 0) {
+			this.#flushRawPasteCandidate();
+		}
+	}
+
 	/** Start one fixed window from the first break-bearing raw read. */
 	#armRawPasteTimer(): void {
 		if (this.#rawPasteTimer) return;

package/src/terminal-capabilities.ts

@@ -10,7 +10,7 @@ import {
 	setKittyGraphics,
 } from "./kitty-graphics";
 import { isInsideHerdr, isInsideTerminalMultiplexer } from "./terminal-multiplexer";
-import { isInsideTmux, wrapTmuxPassthrough, wrapTmuxPassthroughIfNeeded } from "./tmux";
+import { isInsideTmux, resolveTmuxClientTerminalName, wrapTmuxPassthrough, wrapTmuxPassthroughIfNeeded } from "./tmux";
 import type { HangulCompatibilityJamoWidth } from "./utils";
 
 export * from "./terminal-multiplexer";
@@ -37,6 +37,8 @@ export type TerminalId =
 	| "alacritty"
 	| "warp"
 	| "orca"
+	| "otty"
+	| "rio"
 	| "base"
 	| "trueColor";
 
@@ -669,6 +671,18 @@ const KNOWN_TERMINALS = Object.freeze({
 	// honor OSC 8 yet (the escape renders as visible text), so hyperlinks stay off,
 	// but it does support OSC 9 notifications.
 	warp: new TerminalInfo("warp", ImageProtocol.Kitty, true, false, NotifyProtocol.Osc9, false, false, false, 1),
+	// Otty (appmakes, macOS) identifies via TERM_PROGRAM=otty. Its documented
+	// Kitty implementation covers direct and virtual (U+10EEEE placeholder)
+	// placement, and it honors OSC 8 hyperlinks and OSC 99 notifications
+	// (docs.otty.sh terminal comparison). Sixel is not implemented, DECCARA and
+	// OSC 66 text sizing are unverified, so those stay on conservative defaults;
+	// synchronized output is left to the runtime DECRQM probe.
+	otty: new TerminalInfo("otty", ImageProtocol.Kitty, true, true, NotifyProtocol.Osc99),
+	// rio ships the Kitty graphics protocol — direct placement plus U=1 Unicode
+	// placeholders verified by the reporter (#12205). Everything unproven stays
+	// conservative: hyperlinks, DECCARA, screen-to-scrollback, and notifications
+	// keep the base defaults until verified in that terminal.
+	rio: new TerminalInfo("rio", ImageProtocol.Kitty, true, false),
 });
 
 /** Resolve terminal identity from environment markers used by common emulators. */
@@ -677,6 +691,21 @@ export function detectTerminalId(env: NodeJS.ProcessEnv = Bun.env): TerminalId {
 		return a.toLowerCase() === b.toLowerCase(); // For compiler to pattern match
 	}
 
+	function fromProgram(program: string | undefined): TerminalId | null {
+		if (!program) return null;
+		if (caseEq(program, "kitty")) return "kitty";
+		if (caseEq(program, "ghostty")) return "ghostty";
+		if (caseEq(program, "wezterm")) return "wezterm";
+		if (caseEq(program, "iterm.app") || caseEq(program, "iterm2")) return "iterm2";
+		if (caseEq(program, "vscode")) return "vscode";
+		if (caseEq(program, "alacritty")) return "alacritty";
+		if (caseEq(program, "warpterminal")) return "warp";
+		if (caseEq(program, "orca")) return "orca";
+		if (caseEq(program, "otty")) return "otty";
+		if (caseEq(program, "rio")) return "rio";
+		return null;
+	}
+
 	const {
 		KITTY_WINDOW_ID,
 		GHOSTTY_RESOURCES_DIR,
@@ -696,16 +725,13 @@ export function detectTerminalId(env: NodeJS.ProcessEnv = Bun.env): TerminalId {
 	if (VSCODE_PID) return "vscode";
 	if (ALACRITTY_WINDOW_ID) return "alacritty";
 
-	if (TERM_PROGRAM) {
-		if (caseEq(TERM_PROGRAM, "kitty")) return "kitty";
-		if (caseEq(TERM_PROGRAM, "ghostty")) return "ghostty";
-		if (caseEq(TERM_PROGRAM, "wezterm")) return "wezterm";
-		if (caseEq(TERM_PROGRAM, "iterm.app")) return "iterm2";
-		if (caseEq(TERM_PROGRAM, "vscode")) return "vscode";
-		if (caseEq(TERM_PROGRAM, "alacritty")) return "alacritty";
-		if (caseEq(TERM_PROGRAM, "warpterminal")) return "warp";
-		if (caseEq(TERM_PROGRAM, "orca")) return "orca";
-	}
+	const programId = fromProgram(TERM_PROGRAM);
+	if (programId) return programId;
+
+	// tmux >= 3.2 replaces the pane's identity with `TERM_PROGRAM=tmux`.
+	// Its server still holds the attached client's terminal-type reply.
+	const clientProgramId = fromProgram(resolveTmuxClientTerminalName(env) ?? undefined);
+	if (clientProgramId) return clientProgramId;
 
 	if (TERM?.toLowerCase().includes("ghostty")) return "ghostty";
 
@@ -774,7 +800,7 @@ export const TERMINAL: RuntimeTerminal = (() => {
 })();
 
 // Seed Kitty Unicode placeholder support from the resolved terminal id. Only
-// kitty/ghostty are known to honor `U=1` placement; other Kitty-protocol paths
+// kitty/ghostty/otty are known to honor `U=1` placement; other Kitty-protocol paths
 // (wezterm, tmux/screen fallback) treat the placeholder cells as literal PUA
 // glyphs, which is the "ASCII artifact + laggy scrolling" reported in #1877.
 setKittyGraphics({ unicodePlaceholders: detectKittyUnicodePlaceholdersSupport(TERMINAL.id, Bun.env) });

package/src/terminal.ts

@@ -1066,6 +1066,11 @@ export class ProcessTerminal implements Terminal {
 		this.#queryPrivateMode(2026);
 		this.#queryPrivateMode(2048);
 		this.#queryPrivateMode(2031);
+		// 2004 (bracketed paste) is queried only to confirm the terminal brackets
+		// pastes; once confirmed, the unbracketed raw-paste heuristic in
+		// StdinBuffer is disabled so keystrokes an event-loop stall batches into
+		// one read are never misclassified as a paste (#12540).
+		this.#queryPrivateMode(2004);
 		for (const mode of XTERM_SCROLL_TO_BOTTOM_MODES) {
 			this.#queryPrivateMode(mode);
 		}
@@ -1749,6 +1754,11 @@ export class ProcessTerminal implements Terminal {
 		}
 		if (mode === 2048 && supported) this.#enableInBandResize();
 		if (mode === 2031) this.#syncWindowsTerminalAppearancePolling(supported);
+		// Confirmed bracketed-paste support makes the unbracketed raw-paste
+		// heuristic pure downside — turn it off so stall-batched keystrokes are
+		// not misread as a paste (#12540). `supported` is only true here after an
+		// explicit DECRPM reply (the DA1-sentinel fallback resolves unsupported).
+		if (mode === 2004 && supported) this.#stdinBuffer?.setRawPasteClassification(false);
 	}
 
 	#syncWindowsTerminalAppearancePolling(mode2031Supported: boolean): void {

package/src/tmux.ts

@@ -1,3 +1,6 @@
+import { $which } from "@oh-my-pi/pi-utils";
+import { isBunTestRuntime } from "@oh-my-pi/pi-utils/env";
+
 /** Whether the process is running inside a tmux session. */
 export function isInsideTmux(env: NodeJS.ProcessEnv = Bun.env): boolean {
 	return Boolean(env.TMUX);
@@ -12,3 +15,38 @@ export function wrapTmuxPassthrough(payload: string): string {
 export function wrapTmuxPassthroughIfNeeded(payload: string, env: NodeJS.ProcessEnv = Bun.env): string {
 	return isInsideTmux(env) ? wrapTmuxPassthrough(payload) : payload;
 }
+
+const CLIENT_TERMTYPE_NAME = /^([A-Za-z][A-Za-z0-9._+-]*)(?=\s|\(|$)/u;
+const CLIENT_TERMTYPE_TIMEOUT_MS = 500;
+let cachedClientTerminalName: string | null | undefined;
+
+function queryTmuxClientTerminalName(env: NodeJS.ProcessEnv): string | null {
+	const tmux = $which("tmux", { PATH: env.PATH });
+	if (!tmux) return null;
+	try {
+		const result = Bun.spawnSync([tmux, "display-message", "-p", "#{client_termtype}"], {
+			env,
+			stdout: "pipe",
+			stderr: "ignore",
+			timeout: CLIENT_TERMTYPE_TIMEOUT_MS,
+			killSignal: "SIGKILL",
+		});
+		if (result.exitCode !== 0) return null;
+		return CLIENT_TERMTYPE_NAME.exec(result.stdout.toString().trim())?.[1] ?? null;
+	} catch {
+		return null;
+	}
+}
+
+/**
+ * Resolve the terminal emulator name recorded for this tmux client.
+ *
+ * tmux overwrites pane identity variables with its own values, but retains the
+ * attached client's terminal-type reply in `#{client_termtype}`. The local IPC
+ * query runs once per process and degrades to `null` when unavailable.
+ */
+export function resolveTmuxClientTerminalName(env: NodeJS.ProcessEnv = Bun.env): string | null {
+	if (!isInsideTmux(env) || isBunTestRuntime()) return null;
+	if (cachedClientTerminalName === undefined) cachedClientTerminalName = queryTmuxClientTerminalName(env);
+	return cachedClientTerminalName;
+}