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

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 ## [Unreleased]
 
+## [18.2.9] - 2026-09-22
+
+### Added
+
+- Added Claude and Codex saved-reset counts, availability, and expiry to usage views, with provider-specific confirmation and uniquely identified account options.
+- Added terminal detection and capability support for otty and rio, including Kitty graphics and true-color support where available, plus otty hyperlinks and notifications.
+- Added the public `stripTerminalSequences` export for extensions that need to remove terminal control sequences.
+
+### Fixed
+
+- Composer shape previews now use the full available overlay width instead of being clipped at 96 columns.
+- Fixed cursor placement when recalling prompts from history, keeping single-line entries at the end and preserving the appropriate position for multi-line entries.
+- Restored modified-key handling and terminal notifications over SSH sessions running inside tmux.
+- Fixed typed Enter occasionally being interpreted as a literal newline when terminal input events are batched.
+
+## [18.2.8] - 2026-09-21
+
+### Changed
+
+- Improved Bash tool background-task notices by providing completed output as a follow-up and discouraging unnecessary polling.
+
 ## [18.2.7] - 2026-09-21
 
 ### Breaking Changes

package/dist/types/kitty-graphics.d.ts

@@ -26,7 +26,7 @@ export interface KittyGraphicsFeatures {
  * Whether the detected terminal renders Kitty Unicode placeholders (`U=1` +
  * U+10EEEE with row/column diacritics).
  *
- * Kitty and Ghostty advertise placeholder support directly. A multiplexer
+ * Kitty, Ghostty and Otty advertise placeholder support directly. A multiplexer
  * cannot use cursor-positioned placements because the outer terminal does not
  * know pane scroll/reflow state. An explicit `PI_FORCE_IMAGE_PROTOCOL=kitty`
  * opts into placeholders under any multiplexer — matching `timg -pk`.

package/dist/types/overlays/reset-usage-selector.d.ts

@@ -1,18 +1,30 @@
+import type { UsageResetCreditDetail } from "@oh-my-pi/pi-ai";
 import { OverlayPanel } from "../chrome/overlay-box.js";
 /** One account row with its redeemable rate-limit reset credits. */
 export interface ResetUsageAccount {
     label: string;
+    provider: string;
+    providerLabel: string;
+    /** Banked resets, including grants that cannot be spent right now. */
     availableCount: number;
+    /** Resets the provider currently permits this account to spend. */
+    redeemableCount: number;
     target: {
-        credentialId?: number;
+        credentialId: number;
+        provider: string;
+        creditId?: string;
         accountId?: string;
         email?: string;
+        orgId?: string;
     };
     active: boolean;
     error?: string;
+    unavailableReason?: string;
+    expiresAt?: string;
+    credit?: UsageResetCreditDetail;
 }
 /**
- * Account picker for `/usage reset`. Lists Codex accounts with their saved
+ * Account picker for `/usage reset`. Lists provider accounts with their saved
  * rate-limit reset counts; selecting one redeems a reset. Because a reset is a
  * scarce, irreversible credit, Enter requires a second press to confirm.
  */

package/dist/types/overlays/usage-dashboard.d.ts

@@ -32,6 +32,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[];
+    };
 }
 /**
  * Collapse usage reports into one compact card per provider: limits grouped by

package/dist/types/overlays/usage-display.d.ts

@@ -1,5 +1,20 @@
-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 declare function formatLimitTitle(limit: UsageLimit): string;
+/** Human-readable quota scope for a normalized saved-reset window ID. */
+export declare function formatUsageResetWindow(windowId: string): string;
+/** 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 declare function summarizeUsageResetCredits(reset: UsageResetCredits | undefined, nowMs?: number): UsageResetSummary | undefined;
 /** Collapse routing-specific copies of a shared quota for user-facing usage views. */
 export declare function collapseSharedUsageReports(reports: UsageReport[]): UsageReport[];

package/dist/types/prompt/image-source.d.ts

@@ -0,0 +1,26 @@
+/**
+ * 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";
+/** 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;
+}
+declare const kImageAttachmentSource: unique symbol;
+/** 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 declare function tagImageAttachmentSource(image: ImageContent, path: string, kind: ImageAttachmentSourceKind): SourceTaggedImage;
+/** Return the original local source of an image attachment, or undefined for payloads with no source file (clipboard bitmaps). */
+export declare function imageAttachmentSource(image: ImageContent): ImageAttachmentSource | undefined;
+export {};

package/dist/types/prompt/video.d.ts

@@ -1,18 +1,14 @@
 import type { ImageContent } from "@oh-my-pi/pi-ai";
+import { type SourceTaggedImage } from "./image-source.js";
 /** True when the path names a video container we handle through ffmpeg. */
 export declare function isVideoPath(filePath: string): boolean;
-/**
- * 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.
- */
-declare const kVideoPreviewSource: unique symbol;
 /** 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 declare function createVideoPreviewImage(preview: ImageContent, sourcePath: string): VideoPreviewImage;
-/** 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 declare function videoPreviewSource(preview: ImageContent): string | undefined;
-export {};

package/dist/types/status-line/types.d.ts

@@ -209,6 +209,13 @@ export interface SegmentContext {
             percent: number;
             resetHours?: number;
         };
+        resetCredits?: {
+            bankedCount: number;
+            redeemableCount: number;
+            expiryHours?: number;
+            expired?: boolean;
+            unavailableReason?: string;
+        };
     } | null;
 }
 export interface RenderedSegment {

package/dist/types/stdin-buffer.d.ts

@@ -62,6 +62,15 @@ export declare class StdinBuffer extends EventEmitter<StdinBufferEventMap> {
     #private;
     constructor(options?: StdinBufferOptions);
     process(data: string | Buffer): void;
+    /**
+     * 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;
     flush(): string[];
     clear(): void;
     getBuffer(): string;

package/dist/types/terminal-capabilities.d.ts

@@ -11,7 +11,7 @@ export declare enum NotifyProtocol {
     Osc99 = "\u001B]99;;",
     Osc9 = "\u001B]9;"
 }
-export type TerminalId = "kitty" | "ghostty" | "wezterm" | "iterm2" | "vscode" | "alacritty" | "warp" | "orca" | "base" | "trueColor";
+export type TerminalId = "kitty" | "ghostty" | "wezterm" | "iterm2" | "vscode" | "alacritty" | "warp" | "orca" | "otty" | "rio" | "base" | "trueColor";
 /** Terminal capability details used for rendering and protocol selection. */
 export declare class TerminalInfo {
     readonly id: TerminalId;

package/dist/types/tmux.d.ts

@@ -4,3 +4,11 @@ export declare function isInsideTmux(env?: NodeJS.ProcessEnv): boolean;
 export declare function wrapTmuxPassthrough(payload: string): string;
 /** Pass a control sequence through tmux, leaving direct-terminal output unchanged. */
 export declare function wrapTmuxPassthroughIfNeeded(payload: string, env?: NodeJS.ProcessEnv): string;
+/**
+ * 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 declare function resolveTmuxClientTerminalName(env?: NodeJS.ProcessEnv): string | null;

package/dist/types/tools/find.d.ts

@@ -11,7 +11,7 @@ export interface FindRange {
 }
 /** A file whose verified passages cleared the threshold; `ranges` are merged positive spans, strongest first. */
 export interface FindHit {
-    /** Display path relative to {@link FindToolDetails.cwd}. */
+    /** Display path relative to {@link FindToolDetails.cwd}, or an `omp://` doc URL for docs scopes. */
     rel: string;
     /** Filename judgment, when the name batch answered. */
     nameScore?: number;

package/dist/types/tools/hub.d.ts

@@ -44,6 +44,8 @@ export interface JobSnapshot {
     status: "running" | "completed" | "failed" | "cancelled";
     label: string;
     durationMs: number;
+    /** Process exit status when the job reports one. */
+    exitCode?: number;
     /** Effective task model selector, including an explicit reasoning suffix when configured. */
     resolvedModel?: string;
     /** Provider/id including routing, with no added thinking suffix. */

package/dist/types/utils.d.ts

@@ -49,6 +49,8 @@ export declare function getSegmenter(): Intl.Segmenter;
  * sequences (counted as printable by Bun, actually zero cells).
  */
 export declare function visibleWidth(str: string): number;
+/** Remove ANSI, OSC, and APC control sequences while preserving visible text. */
+export declare function stripTerminalSequences(str: string): string;
 /**
  * Scaled spans must bypass wrapping/padding and, when scaled up, reserve the
  * terminal rows their multicell glyphs flow into.

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-tui",
-	"version": "18.2.7",
+	"version": "18.2.9",
 	"description": "Terminal User Interface library with differential rendering for efficient text-based applications",
 	"homepage": "https://omp.sh",
 	"author": "Stencil Labs, Inc.",
@@ -37,14 +37,14 @@
 		"fmt": "oxfmt --no-error-on-unmatched-pattern 'src/**/*.{ts,tsx}' '{test,bench,examples,scripts}/**/*.ts' '*.ts'"
 	},
 	"dependencies": {
-		"@oh-my-pi/omptype": "18.2.7",
-		"@oh-my-pi/pi-agent-core": "18.2.7",
-		"@oh-my-pi/pi-ai": "18.2.7",
-		"@oh-my-pi/pi-catalog": "18.2.7",
-		"@oh-my-pi/pi-natives": "18.2.7",
-		"@oh-my-pi/pi-utils": "18.2.7",
-		"@oh-my-pi/pi-wire": "18.2.7",
-		"@oh-my-pi/snapcompact": "18.2.7"
+		"@oh-my-pi/omptype": "18.2.9",
+		"@oh-my-pi/pi-agent-core": "18.2.9",
+		"@oh-my-pi/pi-ai": "18.2.9",
+		"@oh-my-pi/pi-catalog": "18.2.9",
+		"@oh-my-pi/pi-natives": "18.2.9",
+		"@oh-my-pi/pi-utils": "18.2.9",
+		"@oh-my-pi/pi-wire": "18.2.9",
+		"@oh-my-pi/snapcompact": "18.2.9"
 	},
 	"devDependencies": {
 		"kitty-vt-wasm": "^0.2.0"

package/src/components/editor.ts

@@ -951,6 +951,9 @@ export class Editor implements Component, Focusable {
 			this.restoreHistoryState(entry?.draft?.restore);
 			this.#historyDraftActive = entry?.draft !== undefined;
 		}
+		// Browsing asks for the edge the key came from, so one press still steps one
+		// entry: Up opens a multi-row entry at its top, Down at its bottom (#99).
+		// #setTextInternal drops that request for single-row entries — see there.
 		const cursorAnchor: HistoryCursorAnchor = direction === -1 ? "start" : "end";
 		this.#setTextInternal(entry?.text ?? "", cursorAnchor);
 	}
@@ -959,7 +962,13 @@ export class Editor implements Component, Focusable {
 		this.#undoStack.length = 0;
 		const lines = sanitizeLoadedText(text).split("\n");
 		this.#state.lines = lines.length === 0 ? [""] : lines;
-		if (cursorAnchor === "start") {
+		// A single-row entry's top and bottom are the same row, so the directional
+		// anchor degenerates to a bare column choice: the caret would sit at the start
+		// when Up recalled the entry and at the end when Down reached the same entry,
+		// leaving delete/yank commands aimed at column 0 on one path and at the tail on
+		// the other. Single-row entries always open at the end — matching what
+		// wholesale text replacement (`setText`) and the first-edit anchor do.
+		if (cursorAnchor === "start" && this.#spansMultipleVisualRows()) {
 			this.#state.cursorLine = 0;
 			this.#setCursorCol(0);
 		} else {
@@ -969,6 +978,17 @@ export class Editor implements Component, Focusable {
 		this.#notifyChange();
 	}
 
+	/** Whether the buffer needs more than one visual row at the last painted layout
+	 *  width. The directional history anchors are load-bearing only for such entries —
+	 *  they keep one keypress stepping one entry instead of walking inside it — so a
+	 *  newline-free line that wraps past the editor width counts as multi-row too. */
+	#spansMultipleVisualRows(): boolean {
+		if (this.#state.lines.length > 1) return true;
+		const width = this.#lastLayoutWidth;
+		if (width <= 0) return false;
+		return this.#layoutText(width).length > 1;
+	}
+
 	invalidate(): void {
 		// No cached state to invalidate currently
 	}
@@ -1114,8 +1134,12 @@ export class Editor implements Component, Focusable {
 		const lastGrapheme = beforeGraphemes[beforeGraphemes.length - 1]?.segment;
 		const lastGraphemeWidth = lastGrapheme ? visibleWidth(lastGrapheme) : 0;
 		const builtInCursor = this.#getStyledInputCursor();
+		// The end-of-line cursor borrows the last grapheme's cell, which the
+		// on-character cursor also highlights with reverse video. Underline the
+		// borrowed cell instead so insertion after the last character stays
+		// visually distinct from insertion before it.
 		const fallbackReplacement = lastGrapheme
-			? { text: this.#cursorCell(lastGrapheme), width: lastGraphemeWidth }
+			? { text: `\x1b[4m${lastGrapheme}\x1b[0m`, width: lastGraphemeWidth }
 			: builtInCursor;
 		const clampReplacement = (candidate: { text: string; width: number }): { text: string; width: number } => {
 			let text = sliceByColumn(candidate.text, 0, maxWidth, true);
@@ -1136,7 +1160,6 @@ export class Editor implements Component, Focusable {
 			// If even the highlighted trailing grapheme cannot fit, show the built-in single-column cursor.
 			clampedReplacement = clampReplacement(builtInCursor);
 		}
-
 		const replacedSpanWidth = Math.min(maxWidth, Math.max(lastGraphemeWidth, clampedReplacement.width));
 		const prefixWidth = Math.max(0, maxWidth - replacedSpanWidth);
 		const beforePrefix = sliceByColumn(before, 0, prefixWidth, true);
@@ -1152,17 +1175,14 @@ export class Editor implements Component, Focusable {
 		if (visibleWidth(text) < maxWidth) {
 			return text + marker;
 		}
-
-		let insertAt = text.length;
-		let offset = 0;
-		for (const seg of segmenter.segment(text)) {
-			if (visibleWidth(seg.segment) > 0) {
-				insertAt = offset;
-			}
-			offset += seg.segment.length;
-		}
-
-		return `${text.slice(0, insertAt)}${marker}${text.slice(insertAt)}`;
+		// The row is exactly full, so the marker lands before the last visible
+		// grapheme instead of after it. The mirrored on-character position renders
+		// the identical string; underline the final grapheme at end-of-line so the
+		// two insertion points stay visually distinct.
+		const graphemes = [...segmenter.segment(text)];
+		const lastGrapheme = graphemes[graphemes.length - 1]?.segment;
+		if (lastGrapheme === undefined) return text + marker;
+		return `${text.slice(0, text.length - lastGrapheme.length)}\x1b[4m${lastGrapheme}\x1b[0m${marker}`;
 	}
 
 	#getPageScrollStep(totalVisualLines: number): number {

package/src/kitty-graphics.ts

@@ -63,7 +63,7 @@ export interface KittyGraphicsFeatures {
  * Whether the detected terminal renders Kitty Unicode placeholders (`U=1` +
  * U+10EEEE with row/column diacritics).
  *
- * Kitty and Ghostty advertise placeholder support directly. A multiplexer
+ * Kitty, Ghostty and Otty advertise placeholder support directly. A multiplexer
  * cannot use cursor-positioned placements because the outer terminal does not
  * know pane scroll/reflow state. An explicit `PI_FORCE_IMAGE_PROTOCOL=kitty`
  * opts into placeholders under any multiplexer — matching `timg -pk`.
@@ -82,7 +82,7 @@ export function detectKittyUnicodePlaceholdersSupport(terminalId: string, env: N
 	const insideMultiplexer = isInsideTerminalMultiplexer(env);
 	if (insideMultiplexer && env.PI_FORCE_IMAGE_PROTOCOL?.trim().toLowerCase() === "kitty") return true;
 	if (isInsideHerdr(env)) return false;
-	return terminalId === "kitty" || terminalId === "ghostty";
+	return terminalId === "kitty" || terminalId === "ghostty" || terminalId === "otty" || terminalId === "rio";
 }
 
 let features: KittyGraphicsFeatures = {

package/src/overlays/composer-shape-preview.ts

@@ -49,7 +49,9 @@ export function renderComposerShapePreview(
 	width: number,
 	status?: ComposerPreviewStatusSource,
 ): readonly string[] {
-	const previewWidth = Math.max(24, Math.min(width, 96));
+	// No upper cap: the hosting overlay already bounds width by the terminal,
+	// and capping clips the status band the preview exists to show (#12500).
+	const previewWidth = Math.max(24, width);
 	const style = getComposerStyle(shape);
 	const paddingX = style.defaultPaddingX(undefined);
 	const chromeWidth = style.sideChromeWidth(paddingX);

package/src/overlays/reset-usage-selector.ts

@@ -1,27 +1,41 @@
-import { Container, matchesKey, ScrollView, Spacer, TruncatedText } from "../index";
+import type { UsageResetCreditDetail } from "@oh-my-pi/pi-ai";
+import { Container, matchesKey, ScrollView, Spacer, Text, TruncatedText } from "../index";
+import { formatDuration, sanitizeText } from "@oh-my-pi/pi-utils";
 import { theme } from "../theme/theme";
 import { matchesSelectCancel, matchesSelectDown, matchesSelectUp } from "../keybinding-matchers";
 import { OverlayPanel } from "../chrome/overlay-box";
 import { MenuSelection } from "../components/menu-selection";
 import { centeredViewportRange } from "../components/scroll-viewport";
+import { formatUsageResetWindow } from "./usage-display";
 
 const RESET_SELECTOR_MAX_VISIBLE = 10;
 
 /** One account row with its redeemable rate-limit reset credits. */
 export interface ResetUsageAccount {
 	label: string;
+	provider: string;
+	providerLabel: string;
+	/** Banked resets, including grants that cannot be spent right now. */
 	availableCount: number;
+	/** Resets the provider currently permits this account to spend. */
+	redeemableCount: number;
 	target: {
-		credentialId?: number;
+		credentialId: number;
+		provider: string;
+		creditId?: string;
 		accountId?: string;
 		email?: string;
+		orgId?: string;
 	};
 	active: boolean;
 	error?: string;
+	unavailableReason?: string;
+	expiresAt?: string;
+	credit?: UsageResetCreditDetail;
 }
 
 /**
- * Account picker for `/usage reset`. Lists Codex accounts with their saved
+ * Account picker for `/usage reset`. Lists provider accounts with their saved
  * rate-limit reset counts; selecting one redeems a reset. Because a reset is a
  * scarce, irreversible credit, Enter requires a second press to confirm.
  */
@@ -36,18 +50,17 @@ export class ResetUsageSelectorComponent extends OverlayPanel {
 		super("Spend a saved rate-limit reset");
 		this.#onSelectCallback = onSelect;
 		this.#onCancelCallback = onCancel;
-		const firstRedeemable = accounts.find(account => account.availableCount > 0);
+		const firstRedeemable = accounts.find(account => account.redeemableCount > 0);
+		const accountKey = (account: ResetUsageAccount) =>
+			`${account.provider}:${account.target.credentialId}:${account.target.creditId ?? ""}`;
 		this.#menu = new MenuSelection<ResetUsageAccount>(
 			accounts,
 			{
-				getKey: account =>
-					`${account.target.credentialId ?? ""}:${account.target.accountId ?? ""}:${account.target.email ?? ""}:${account.label}`,
-				getSearchText: account => account.label,
-				requiresConfirmation: account => account.availableCount > 0,
+				getKey: accountKey,
+				getSearchText: account => `${account.label} ${account.providerLabel}`,
+				requiresConfirmation: account => account.redeemableCount > 0,
 			},
-			firstRedeemable
-				? `${firstRedeemable.target.credentialId ?? ""}:${firstRedeemable.target.accountId ?? ""}:${firstRedeemable.target.email ?? ""}:${firstRedeemable.label}`
-				: undefined,
+			firstRedeemable ? accountKey(firstRedeemable) : undefined,
 		);
 
 		this.#listContainer = new Container();
@@ -57,6 +70,7 @@ export class ResetUsageSelectorComponent extends OverlayPanel {
 
 	#updateList(): void {
 		this.#listContainer.clear();
+		const oneLine = (value: string): string => sanitizeText(value.replace(/[\r\n\t]+/g, " "));
 
 		const items = this.#menu.visibleItems;
 		const total = items.length;
@@ -68,22 +82,43 @@ export class ResetUsageSelectorComponent extends OverlayPanel {
 			const account = items[i];
 			if (!account) continue;
 			const isSelected = i === this.#menu.selectedIndex;
-			const redeemable = account.availableCount > 0;
-			const countLabel = account.error
-				? account.error
-				: `${account.availableCount} saved reset${account.availableCount === 1 ? "" : "s"}`;
+			const redeemable = account.redeemableCount > 0;
+			let countLabel: string;
+			if (account.error) {
+				countLabel = oneLine(account.error);
+			} else {
+				countLabel = `${account.availableCount} saved reset${account.availableCount === 1 ? "" : "s"}`;
+				if (account.redeemableCount !== account.availableCount) {
+					countLabel += ` · ${account.redeemableCount} usable now`;
+				}
+				if (account.expiresAt) {
+					const expiryMs = Date.parse(account.expiresAt);
+					if (!Number.isNaN(expiryMs)) {
+						countLabel +=
+							expiryMs > Date.now() ? ` · expires in ${formatDuration(expiryMs - Date.now())}` : " · expired";
+					}
+				}
+				if (!redeemable && account.unavailableReason) {
+					countLabel += ` · ${oneLine(account.unavailableReason)}`;
+				}
+			}
 			const countText = account.error
 				? theme.fg("error", countLabel)
 				: redeemable
 					? theme.fg("success", countLabel)
 					: theme.fg("dim", countLabel);
 			const activeTag = account.active ? theme.fg("muted", " (active)") : "";
+			const safeLabel = oneLine(account.label);
+			const providerTag = theme.fg(
+				"muted",
+				`[${oneLine(account.providerLabel)} · #${account.target.credentialId}] `,
+			);
 			if (isSelected) {
-				const name = redeemable ? theme.fg("accent", account.label) : theme.fg("dim", account.label);
-				rows.push(`${theme.fg("accent", `${theme.nav.cursor} `)}${name}${activeTag}  ${countText}`);
+				const name = redeemable ? theme.fg("accent", safeLabel) : theme.fg("dim", safeLabel);
+				rows.push(`${theme.fg("accent", `${theme.nav.cursor} `)}${providerTag}${name}${activeTag}  ${countText}`);
 			} else {
-				const name = redeemable ? `  ${account.label}` : theme.fg("dim", `  ${account.label}`);
-				rows.push(`${name}${activeTag}  ${countText}`);
+				const name = redeemable ? safeLabel : theme.fg("dim", safeLabel);
+				rows.push(`  ${providerTag}${name}${activeTag}  ${countText}`);
 			}
 		}
 
@@ -100,20 +135,35 @@ export class ResetUsageSelectorComponent extends OverlayPanel {
 
 		if (total === 0) {
 			this.#listContainer.addChild(
-				new TruncatedText(theme.fg("muted", "No Codex accounts with saved resets"), 0, 0),
+				new TruncatedText(theme.fg("muted", "No provider accounts with saved resets"), 0, 0),
 			);
 		}
 
 		const pending = items.find(item => this.#menu.isPending(item));
 		const hint = pending
-			? theme.fg("warning", `Press Enter again to spend 1 reset for ${pending.label}, Esc to cancel`)
+			? theme.fg("warning", oneLine(this.#confirmationMessage(pending)))
 			: theme.fg("muted", "↑/↓ select · ↵ spend a reset · Esc cancel");
-		this.#listContainer.addChild(new TruncatedText(hint, 0, 0));
+		this.#listContainer.addChild(new Text(hint, 0, 0));
 
 		if (this.#statusMessage) {
 			this.#listContainer.addChild(new Spacer(1));
-			this.#listContainer.addChild(new TruncatedText(theme.fg("warning", this.#statusMessage), 0, 0));
+			this.#listContainer.addChild(new Text(theme.fg("warning", oneLine(this.#statusMessage)), 0, 0));
+		}
+	}
+
+	#confirmationMessage(account: ResetUsageAccount): string {
+		const subject = account.credit?.title ? `“${account.credit.title}”` : "1 saved reset";
+		const messages = [`Press Enter again to spend ${subject} for ${account.label} (${account.providerLabel}).`];
+		if (account.credit?.program === "juniper_tide") {
+			messages.push("This resets Claude's 5h session limit only; weekly limits stay unchanged.");
+		} else if (account.credit?.clears?.length) {
+			messages.push(`Covers ${account.credit.clears.map(formatUsageResetWindow).join(", ")}.`);
+		}
+		if (account.credit?.requiresLimit === false) {
+			messages.push("Optional early use: this can be spent before the covered limit is reached.");
 		}
+		messages.push("Esc cancels.");
+		return messages.join(" ");
 	}
 
 	handleInput(keyData: string): void {
@@ -150,8 +200,10 @@ export class ResetUsageSelectorComponent extends OverlayPanel {
 		} else if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
 			const account = this.#menu.selectedItem;
 			if (!account) return;
-			if (account.availableCount <= 0) {
-				this.#statusMessage = "That account has no saved resets to spend.";
+			if (account.redeemableCount <= 0) {
+				this.#statusMessage = account.unavailableReason
+					? `That account's saved resets are unavailable: ${account.unavailableReason}`
+					: "That account has no saved resets usable right now.";
 				this.#updateList();
 				return;
 			}