@linxiraos/pi-tui 1.1.27 → 1.2.0

package/src/status-line/host.ts

@@ -2,7 +2,7 @@ import type { AgentMessage, ThinkingLevel } from "@linxiraos/pi-agent-core";
 import type { Tool, UsageLimit, UsageReport } from "@linxiraos/pi-ai";
 import type { Model } from "@linxiraos/pi-catalog/types";
 import type { CompactionBoundaries } from "./context-usage";
-import type { StatusLineSettings } from "./types";
+import type { StatusLineSettings, StatusResetExpiry } from "./types";
 
 export interface StatusAccountIdentity {
 	accountId?: string;
@@ -93,6 +93,9 @@ export interface StatusLineHost<TSession extends StatusLineSession = StatusLineS
 	lookupPullRequest(cwd: string): Promise<{ stdout: string; exitCode: number }>;
 	calculateTokensPerSecond(messages: readonly AgentMessage[], isStreaming: boolean): number | null;
 	limitMatchesActiveAccount(report: UsageReport, limit: UsageLimit, identity: StatusAccountIdentity): boolean;
+	classifyResetExpiry?(report: UsageReport, nowMs: number): StatusResetExpiry | undefined;
+	/** One-line warning for saved resets anywhere in the pool that expire within 24 hours. */
+	resetExpiryNotice?(reports: readonly UsageReport[], nowMs: number): string | undefined;
 	computeCompactionBoundaries(session: TSession, contextWindow: number, model?: Model): CompactionBoundaries | null;
 }
 

package/src/status-line/segments.ts

@@ -184,7 +184,9 @@ function getProjectDirDisplay(projectDir: string): ProjectDirDisplay {
 		}
 	}
 	if (!scratch) {
-		displayRoots ??= [path.join(homeDir, "Projects"), "/work"].map(normalizePathForComparison);
+		displayRoots ??= [path.join(homeDir, "Projects"), path.join(homeDir, "repos"), "/work"].map(
+			normalizePathForComparison,
+		);
 		for (const root of displayRoots) {
 			const relative = relativePathWithinNormalizedRoot(root, normalizedProjectDir);
 			if (relative) {
@@ -484,6 +486,9 @@ function formatLoopLimit(
 	return `${seconds}s left`;
 }
 
+/** Zeta-only: the ultra plan workflow gets its own status-line label (lost in the v18.8.8 merge once already). */
+export const PLAN_ULTRA_LABEL = "Plan-Ultra";
+
 const modeSegment: StatusLineSegment = {
 	id: "mode",
 	render(ctx) {
@@ -491,7 +496,8 @@ const modeSegment: StatusLineSegment = {
 
 		const plan = ctx.planMode;
 		if (plan && (plan.enabled || plan.paused)) {
-			const label = plan.paused ? `Plan${pauseSuffix}` : "Plan";
+			const title = plan.workflow === "ultra" ? PLAN_ULTRA_LABEL : "Plan";
+			const label = plan.paused ? `${title}${pauseSuffix}` : title;
 			const content = withIcon(theme.icon.plan, label);
 			return {
 				content: plan.paused ? theme.fg("warning", content) : accentFg(ctx, "accent", content),
@@ -536,9 +542,10 @@ const modeSegment: StatusLineSegment = {
 	describe(ctx) {
 		const plan = ctx.planMode;
 		if (plan && (plan.enabled || plan.paused)) {
+			const title = plan.workflow === "ultra" ? PLAN_ULTRA_LABEL : "Plan";
 			return plan.paused
-				? segView([span("Plan (paused)", "warning")], "plan", "warning")
-				: segView([span("Plan", accentToken(ctx, "accent"))], "plan");
+				? segView([span(`${title} (paused)`, "warning")], "plan", "warning")
+				: segView([span(title, accentToken(ctx, "accent"))], "plan");
 		}
 		if (ctx.prewalk?.enabled) return segView([span("Prewalk", accentToken(ctx, "accent"))], "prewalk");
 		const goal = ctx.goalMode;
@@ -677,19 +684,15 @@ const gitSegment: StatusLineSegment = {
 		const showBranch = opts.showBranch !== false;
 		const spans: TspSpan[] = [];
 		if (showBranch && branch) spans.push(span(branch, colorName));
-		const indicators: TspSpan[] = [];
 		if (status) {
-			if (opts.showUnstaged !== false && status.unstaged > 0) {
-				indicators.push(span(`*${status.unstaged}`, "statusLineDirty"));
-			}
-			if (opts.showStaged !== false && status.staged > 0) {
-				indicators.push(span(`+${status.staged}`, "statusLineStaged"));
-			}
-			if (opts.showUntracked !== false && status.untracked > 0) {
-				indicators.push(span(`?${status.untracked}`, "statusLineUntracked"));
-			}
+			// Spans join as one text: each count after the branch or a previous count leads with a space.
+			const push = (text: string, token: string): void => {
+				spans.push(span(spans.length > 0 ? ` ${text}` : text, token));
+			};
+			if (opts.showUnstaged !== false && status.unstaged > 0) push(`*${status.unstaged}`, "statusLineDirty");
+			if (opts.showStaged !== false && status.staged > 0) push(`+${status.staged}`, "statusLineStaged");
+			if (opts.showUntracked !== false && status.untracked > 0) push(`?${status.untracked}`, "statusLineUntracked");
 		}
-		spans.push(...indicators);
 		if (spans.length === 0) return null;
 		return segView(spans, showBranch && branch ? "branch" : "git", isDirty ? "warning" : undefined);
 	},
@@ -968,16 +971,19 @@ const sessionSegment: StatusLineSegment = {
 	},
 };
 
+/** Short (first-label) machine hostname; resolved once — `os.hostname()` is a syscall per call. */
+let shortHostname: string | undefined;
+
 const hostnameSegment: StatusLineSegment = {
 	id: "hostname",
 	render(ctx) {
-		const name = ctx.hostname ?? os.hostname().split(".")[0];
+		const name = ctx.hostname ?? (shortHostname ??= os.hostname().split(".")[0]);
 		const content = withIcon(theme.icon.host, name);
 		const ansi = sessionAccentAnsi(ctx);
 		return { content: ansi ? `${ansi}${content}\x1b[39m` : content, visible: true };
 	},
 	describe(ctx) {
-		const name = ctx.hostname ?? os.hostname().split(".")[0];
+		const name = ctx.hostname ?? (shortHostname ??= os.hostname().split(".")[0]);
 		return segView([span(name, sessionAccentAnsi(ctx) ? "accent" : undefined)], "host");
 	},
 };
@@ -1081,6 +1087,7 @@ const VIM_MODE_LABELS: Record<NonNullable<SegmentContext["vim"]>["mode"], string
 	normal: "NORMAL",
 	visual: "VISUAL",
 	"visual-line": "V-LINE",
+	replace: "REPLACE",
 };
 
 /**
@@ -1093,6 +1100,7 @@ const VIM_MODE_ICON_KEYS: Record<NonNullable<SegmentContext["vim"]>["mode"], Sym
 	normal: "icon.vimNormal",
 	visual: "icon.vimVisual",
 	"visual-line": "icon.vimVisualLine",
+	replace: "icon.vimReplace",
 };
 
 const VIM_MODE_COLORS: Record<NonNullable<SegmentContext["vim"]>["mode"], ThemeColor> = {
@@ -1100,6 +1108,7 @@ const VIM_MODE_COLORS: Record<NonNullable<SegmentContext["vim"]>["mode"], ThemeC
 	normal: "accent",
 	visual: "warning",
 	"visual-line": "warning",
+	replace: "accent",
 };
 
 const vimSegment: StatusLineSegment = {
@@ -1187,6 +1196,12 @@ function formatUsageReset(value: number, unit: "m" | "h"): string {
 	return hours > 0 ? `${days}d ${hours}h` : `${days}d`;
 }
 
+/** Expiring saved resets outrank the usable/unusable color: red within 24 hours, yellow within 7 days. */
+function resetCreditsColor(resets: NonNullable<NonNullable<SegmentContext["usage"]>["resetCredits"]>): ThemeColor {
+	if (resets.expiring) return resets.expiring.tier === "imminent" ? "error" : "warning";
+	return resets.redeemableCount > 0 ? "success" : "warning";
+}
+
 const usageSegment: StatusLineSegment = {
 	id: "usage",
 	render(ctx) {
@@ -1221,7 +1236,8 @@ const usageSegment: StatusLineSegment = {
 				resetText += ` (${resets.redeemableCount} usable)`;
 			}
 			if (resets.expiryHours !== undefined) {
-				resetText += ` exp ${formatUsageReset(resets.expiryHours, "h")}`;
+				const expiring = resets.expiring ? `▲ ${resets.expiring.count} ` : "";
+				resetText += ` ${expiring}exp ${formatUsageReset(resets.expiryHours, "h")}`;
 			} else if (resets.expired) {
 				resetText += " expired";
 			}
@@ -1229,7 +1245,7 @@ const usageSegment: StatusLineSegment = {
 				const reason = truncateToWidth(sanitizeStatusText(resets.unavailableReason), TRUNCATE_LENGTHS.SHORT);
 				if (reason) resetText += ` ${reason}`;
 			}
-			parts.push(theme.fg(resets.redeemableCount > 0 ? "success" : "warning", resetText));
+			parts.push(theme.fg(resetCreditsColor(resets), resetText));
 		}
 		const content = withIcon(theme.icon.time, parts.join(theme.sep.dot));
 		return { content, visible: true };
@@ -1254,13 +1270,15 @@ const usageSegment: StatusLineSegment = {
 			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.expiryHours !== undefined) {
+				const expiring = resets.expiring ? `▲ ${resets.expiring.count} ` : "";
+				resetText += ` ${expiring}exp ${formatUsageReset(resets.expiryHours, "h")}`;
+			} else if (resets.expired) resetText += " expired";
 			if (resets.redeemableCount === 0 && resets.unavailableReason) {
 				const reason = sanitizeStatusText(resets.unavailableReason);
 				if (reason) resetText += ` ${reason}`;
 			}
-			parts.push([span(resetText, resets.redeemableCount > 0 ? "success" : "warning")]);
+			parts.push([span(resetText, resetCreditsColor(resets))]);
 		}
 		const spans: TspSpan[] = [];
 		for (const part of parts) {

package/src/status-line/types.ts

@@ -95,6 +95,8 @@ export interface SegmentContext {
 	planMode: {
 		enabled: boolean;
 		paused: boolean;
+		/** Plan workflow variant; `ultra` renders as `Plan-Ultra` in the mode segment. */
+		workflow?: "parallel" | "iterative" | "ultra";
 	} | null;
 	prewalk: {
 		enabled: boolean;
@@ -114,7 +116,7 @@ export interface SegmentContext {
 	} | null;
 	/** Modal editing state, or null when `tui.vimMode` is off. */
 	vim: {
-		mode: "insert" | "normal" | "visual" | "visual-line";
+		mode: "insert" | "normal" | "visual" | "visual-line" | "replace";
 		/** Half-typed operator/count (`"2d"`), empty when nothing is pending. */
 		pending: string;
 		/** Lines spanned by the active Visual selection; 0 outside Visual modes. */
@@ -202,10 +204,20 @@ export interface SegmentContext {
 			expiryHours?: number;
 			expired?: boolean;
 			unavailableReason?: string;
+			expiring?: StatusResetExpiry;
 		};
 	} | null;
 }
 
+/** How close an account's saved resets are to expiring, when it is worth a warning. */
+export interface StatusResetExpiry {
+	/** `soon`: within 7 days; `imminent`: within 24 hours. */
+	tier: "soon" | "imminent";
+	count: number;
+	/** Expiry of the reset the warning is about (epoch ms); it can be later than the soonest banked one. */
+	expiresAtMs: number;
+}
+
 export interface RenderedSegment {
 	content: string; // The segment text (may include ANSI color codes)
 	visible: boolean; // Whether to render (e.g., git hidden when not in repo)
@@ -227,8 +239,8 @@ export interface SegmentView {
 
 /**
  * The status line's facts for the native composer. A TSP terminal shows no
- * status strip: the tab title carries the session, the pane header the path
- * and branch, and the composer the rest.
+ * status strip: the tab title carries the session, the pane header the path,
+ * and the composer the rest (the git branch among its facts).
  */
 export interface ComposerFacts {
 	/**

package/src/terminal-capabilities.d.ts

@@ -1,6 +1,6 @@
 import type { HangulCompatibilityJamoWidth } from "./utils";
 export * from "./terminal-multiplexer";
-export { isInsideTmux, wrapTmuxPassthrough } from "./tmux";
+export { wrapTmuxPassthrough } from "./tmux";
 export declare enum ImageProtocol {
     Kitty = "\u001B_G",
     Iterm2 = "\u001B]1337;File=",
@@ -55,12 +55,6 @@ export declare class TerminalInfo {
     formatNotification(message: string | TerminalNotification): string;
     sendNotification(message: string | TerminalNotification): void;
 }
-/**
- * Whether the agent process is running inside a Zellij session. Read fresh on
- * each call (like {@link isInsideTmux}) so a session attached/detached mid-run
- * is observed and tests can toggle `Bun.env.ZELLIJ` per case.
- */
-export declare function isInsideZellij(env?: NodeJS.ProcessEnv): boolean;
 /**
  * Whether the agent process runs in an SSH session, so the terminal emulator
  * is remote and host-local input/keyboard modes cannot be assumed.
@@ -96,12 +90,12 @@ export declare function synchronizedOutputUserOverride(env?: NodeJS.ProcessEnv):
  *   2. Positive `TERM_FEATURES` advertisement (`Sy`) — survives SSH/mux wrapping.
  *   3. Windows Terminal (1.24+) via `WT_SESSION`, on native win32 and the
  *      WSL/SSH-fronted host alike.
- *   4. Herdr panes. Herdr is otherwise treated as a multiplexer so leaked
- *      kitty/ghostty identities cannot enable placeholder graphics, but its
- *      pane VTE is libghostty and already suppresses compositing while DEC 2026
- *      is set. Leaving sync off lets CUP-diff paints and split write(2) chunks
- *      composite as dirty-row patches — the live viewport tears, with the top
- *      frozen while only the bottom refreshes.
+ *   4. A multiplexer session whose pane VTE honors DEC 2026 regardless of its
+ *      DECRQM reply (Herdr's libghostty pane). Such a multiplexer still owns
+ *      the grid, so leaked kitty/ghostty identities cannot enable placeholder
+ *      graphics, but leaving sync off lets CUP-diff paints and split write(2)
+ *      chunks composite as dirty-row patches — the live viewport tears, with
+ *      the top frozen while only the bottom refreshes.
  *   5. Known direct terminals with confirmed support. SSH does *not* disable —
  *      DEC 2026 passes through SSH when the outer terminal honors it.
  *   6. Everything else starts off, including risky multiplexers; the runtime
@@ -167,31 +161,29 @@ export declare function hyperlinksUserOverride(env?: NodeJS.ProcessEnv): boolean
  * Policy (highest precedence first):
  *   1. Explicit user override (`PI_NO_HYPERLINKS=1` off, `PI_FORCE_HYPERLINKS=1`
  *      on). Opt-out wins ties.
- *   2. Herdr pane with no nested screen/tmux: on. Herdr hides the outer
- *      terminal (`TERM=xterm-256color`, no `TERM_PROGRAM`), but it renders
- *      OSC 8 in its own grid and opens links itself on Ctrl+click, so the
- *      outer terminal's support does not matter.
+ *   2. Every multiplexer session with a hyperlink policy renders OSC 8 itself
+ *      (`render`, e.g. Herdr): on. Herdr hides the outer terminal
+ *      (`TERM=xterm-256color`, no `TERM_PROGRAM`), so the outer terminal's
+ *      support does not matter.
  *   2b. Zeta workbench pane with no nested screen/tmux: on, for the same
  *      reason — the workbench's terminal simulator renders OSC 8 itself and
  *      opens links on Ctrl+click (`ZETA_WORKBENCH=1` is injected into every
  *      pane PTY; the outer terminal is invisible from inside).
  *   3. Static terminal capability — terminals whose {@link TerminalInfo} marks
  *      `hyperlinks: false` (e.g. `base`) stay off unless the user forced on.
- *   4. GNU screen's explicit session marker (`STY`) always off, even if tmux is
- *      also present: a screen layer anywhere in the path cannot forward OSC 8.
- *   5. tmux session (`TMUX` set): enabled when tmux self-reports >= 3.4 via
- *      `TERM_PROGRAM_VERSION` (tmux 3.4 stores OSC 8 as a cell attribute and
- *      forwards it to outer terminals whose `terminal-features` include
- *      `hyperlinks`). Older or unknown versions stay off; on outer terminals
- *      without the feature configured, tmux silently drops the sequence —
- *      identical to today. Checked before the screen-family TERM heuristic
- *      because tmux's historical `default-terminal` is `screen-256color`, so
- *      `TERM=screen*` inside a tmux session must NOT short-circuit to off.
- *   6. screen-family TERM without `TMUX` always off: screen never gained OSC 8
- *      support.
- *   7. tmux-family TERM without `TMUX` env — unusual (e.g. inspection scripts);
- *      no version available, so off.
- *   8. Otherwise honor the static terminal capability.
+ *   4. A session that never forwards OSC 8 (`drop`, e.g. GNU screen's `STY`)
+ *      always off, even when a forwarding multiplexer is also present.
+ *   5. Forwarding sessions (`forward`, e.g. `TMUX`): enabled when every one
+ *      self-reports at least its forwarding version via `TERM_PROGRAM` /
+ *      `TERM_PROGRAM_VERSION` (tmux 3.4). Older or unknown versions stay off;
+ *      on outer terminals without the feature configured, tmux silently drops
+ *      the sequence. Checked before the TERM heuristic because tmux's
+ *      historical `default-terminal` is `screen-256color`, so `TERM=screen*`
+ *      inside a tmux session must NOT short-circuit to off.
+ *   6. TERM naming a multiplexer whose session markers were stripped: off,
+ *      since no session proves the multiplexer forwards OSC 8 (screen never
+ *      does; tmux has no version to check).
+ *   7. Otherwise honor the static terminal capability.
  */
 export declare function shouldEnableHyperlinksByDefault(env?: NodeJS.ProcessEnv, terminalId?: TerminalId): boolean;
 /**
@@ -343,7 +335,7 @@ export interface ParsedKittyPlacementLine {
 /**
  * Parse a frame line that consists solely of a Kitty direct placement (the
  * last line of an {@link Image} block). Returns null for anything else —
- * placeholder grids, tmux-wrapped placements, sixel/iTerm2 payloads — so
+ * placeholder grids, sixel/iTerm2 payloads — so
  * callers fall back to writing the line verbatim.
  */
 export declare function parseKittyDirectPlacementLine(line: string): ParsedKittyPlacementLine | null;
@@ -383,8 +375,8 @@ export declare function encodeKittyDeleteAllImages(): string;
 /**
  * Delete a single placement of an image (`d=i`, lowercase): removes its cells
  * and registry entry but keeps the transmitted data, so a later `a=p` under a
- * fresh placement id needs no retransmit. Used to clear stale placement-epoch
- * entries after a destructive history clear.
+ * fresh placement id needs no retransmit. The frame writer uses this before
+ * replacing a live image without deleting its archived copies.
  */
 export declare function encodeKittyDeletePlacement(imageId: number, placementId: number): string;
 export declare function encodeITerm2(base64Data: string, options?: {