@oh-my-pi/pi-tui 18.4.2 → 18.4.3

package/src/tools/streaming-output.ts

@@ -718,6 +718,12 @@ const MAX_PENDING = 10;
 export class TailBuffer {
 	#pending: string[] = [];
 	#pos = 0; // byte count of the currently-held tail (after trims)
+	// `#pending[0]` and its byte count. Clean = well-formed and `#headBytes` is its exact
+	// UTF-8 length (a head compacted from chunks that split a surrogate pair is neither).
+	#headBytes = 0;
+	#headClean = true;
+	// Every chunk after `#pending[0]` is well-formed (no lone surrogates).
+	#restWellFormed = true;
 
 	constructor(readonly maxBytes: number) {}
 
@@ -726,8 +732,7 @@ export class TailBuffer {
 
 		const max = this.maxBytes;
 		if (max === 0) {
-			this.#pending.length = 0;
-			this.#pos = 0;
+			this.#setHead("", 0, true);
 			return;
 		}
 
@@ -736,19 +741,17 @@ export class TailBuffer {
 		// If the incoming chunk alone is >= budget, it fully dominates the tail.
 		if (n >= max) {
 			const { text: t, bytes } = truncateTailBytes(text, max);
-			this.#pending[0] = t;
-			this.#pending.length = 1;
-			this.#pos = bytes;
+			// A chunk of exactly `max` bytes comes back verbatim, lone surrogates included.
+			this.#setHead(t, bytes, t.isWellFormed());
 			return;
 		}
 
-		this.#pos += n;
-
 		if (this.#pending.length === 0) {
-			this.#pending[0] = text;
-			this.#pending.length = 1;
+			this.#setHead(text, n, text.isWellFormed());
 		} else {
+			this.#pos += n;
 			this.#pending.push(text);
+			if (this.#restWellFormed && !text.isWellFormed()) this.#restWellFormed = false;
 			if (this.#pending.length > MAX_PENDING) this.#compact();
 		}
 
@@ -770,9 +773,22 @@ export class TailBuffer {
 
 	// -- private ---------------------------------------------------------------
 
+	/** Replace the whole buffer with a single chunk. */
+	#setHead(text: string, bytes: number, clean: boolean): void {
+		this.#pending[0] = text;
+		this.#pending.length = 1;
+		this.#pos = bytes;
+		this.#headBytes = bytes;
+		this.#headClean = clean;
+		this.#restWellFormed = true;
+	}
+
 	#compact(): void {
 		this.#pending[0] = this.#pending.join("");
 		this.#pending.length = 1;
+		this.#headBytes = this.#pos;
+		this.#headClean = this.#headClean && this.#restWellFormed;
+		this.#restWellFormed = true;
 	}
 
 	#flush(): string {
@@ -783,17 +799,64 @@ export class TailBuffer {
 
 	#trimTo(max: number): void {
 		if (max === 0) {
-			this.#pending.length = 0;
-			this.#pos = 0;
+			this.#setHead("", 0, true);
 			return;
 		}
 		if (this.#pos <= max) return;
 
-		const joined = this.#flush();
-		const { text, bytes } = truncateTailBytes(joined, max);
-		this.#pos = bytes;
-		this.#pending[0] = text;
-		this.#pending.length = 1;
+		// Steady state (one `text()` per appended chunk): the overflow lies inside the
+		// already-trimmed head, so only the head's front is cut and the chunks after it
+		// are kept verbatim instead of re-encoding the whole window. Those chunks must be
+		// well-formed: the full path round-trips them through UTF-8, which rewrites lone
+		// surrogates (and heals pairs split across chunk boundaries).
+		const restBytes = this.#pos - this.#headBytes;
+		if (restBytes < max && this.#restWellFormed) {
+			const head = this.#pending[0];
+			const keep = max - restBytes;
+			const drop = this.#headBytes - keep;
+			if (head.length === this.#headBytes) {
+				// All-ASCII head: byte offsets are char offsets and every byte is a boundary.
+				this.#pending[0] = head.slice(drop);
+				this.#headBytes = keep;
+			} else if (this.#headClean && drop <= keep) {
+				// Walk code points to the first boundary at or after `drop` bytes.
+				let dropped = 0;
+				let index = 0;
+				while (dropped < drop) {
+					const code = head.charCodeAt(index);
+					if (code < 0x80) {
+						dropped += 1;
+						index += 1;
+					} else if (code < 0x800) {
+						dropped += 2;
+						index += 1;
+					} else if (code >= 0xd800 && code <= 0xdbff) {
+						// Well-formed, so a high surrogate always starts a pair.
+						dropped += 4;
+						index += 2;
+					} else {
+						dropped += 3;
+						index += 1;
+					}
+				}
+				this.#pending[0] = head.slice(index);
+				this.#headBytes -= dropped;
+			} else {
+				// A head that already fits comes back verbatim, lone surrogates included.
+				const { text, bytes } = truncateTailBytes(head, keep);
+				this.#pending[0] = text;
+				this.#headBytes = bytes;
+				this.#headClean = text.isWellFormed();
+				this.#pos = this.#headBytes + restBytes;
+				return;
+			}
+			this.#headClean = true;
+			this.#pos = this.#headBytes + restBytes;
+			return;
+		}
+
+		const { text, bytes } = truncateTailBytes(this.#flush(), max);
+		this.#setHead(text, bytes, text.isWellFormed());
 	}
 }
 

package/src/tools/web-search-types.ts

@@ -0,0 +1,99 @@
+/**
+ * Web search response types shared by the coding agent's search providers and
+ * the transcript renderer in {@link ./web-search}. Render-free, so provider code
+ * can import it without loading UI components.
+ */
+
+/**
+ * Display label for every search implementation: `web/*` engines and the
+ * chat-model groundings. Keys are the ids providers report in
+ * {@link SearchResponse.provider} and search errors.
+ */
+export const SEARCH_PROVIDER_LABELS = {
+	parallel: "Parallel",
+	perplexity: "Perplexity",
+	gemini: "Gemini",
+	anthropic: "Anthropic",
+	codex: "OpenAI Codex",
+	openai: "OpenAI API",
+	xai: "xAI",
+	openrouter: "OpenRouter",
+	zai: "Z.AI",
+	exa: "Exa",
+	tinyfish: "TinyFish",
+	jina: "Jina",
+	kagi: "Kagi",
+	tavily: "Tavily",
+	firecrawl: "Firecrawl",
+	brave: "Brave",
+	kimi: "Kimi",
+	synthetic: "Synthetic",
+	ollama: "Ollama",
+	searxng: "SearXNG",
+	startpage: "Startpage",
+	duckduckgo: "DuckDuckGo",
+	ecosia: "Ecosia",
+	google: "Google",
+	mojeek: "Mojeek",
+	public: "Public Web",
+} as const;
+
+/** Id of a search implementation; see {@link SEARCH_PROVIDER_LABELS}. */
+export type SearchProviderId = keyof typeof SEARCH_PROVIDER_LABELS;
+
+/** Label for a provider id; ids from older transcripts fall back to the raw id. */
+export function getSearchProviderLabel(id: SearchProviderId): string {
+	return SEARCH_PROVIDER_LABELS[id] ?? id;
+}
+
+/** Source returned by search (all providers) */
+export interface SearchSource {
+	title: string;
+	url: string;
+	snippet?: string;
+	/** ISO date string or relative ("2d ago") */
+	publishedDate?: string;
+	/** Age in seconds for consistent formatting */
+	ageSeconds?: number;
+	author?: string;
+}
+
+/** Citation with text reference (LLM-mediated providers) */
+export interface SearchCitation {
+	url: string;
+	title: string;
+	citedText?: string;
+}
+
+/** Usage metrics */
+export interface SearchUsage {
+	inputTokens?: number;
+	outputTokens?: number;
+	/** Anthropic: number of web search requests made */
+	searchRequests?: number;
+	/** Perplexity: combined token count */
+	totalTokens?: number;
+}
+
+/** Unified response across providers */
+export interface SearchResponse {
+	provider: SearchProviderId | "none";
+	/** Synthesized answer text (LLM-mediated providers) */
+	answer?: string;
+	/** Search result sources */
+	sources: SearchSource[];
+	/** Text citations with context */
+	citations?: SearchCitation[];
+	/** Intermediate search queries (anthropic) */
+	searchQueries?: string[];
+	/** Follow-up question suggestions (provider-dependent) */
+	relatedQuestions?: string[];
+	/** Token usage metrics */
+	usage?: SearchUsage;
+	/** Model used */
+	model?: string;
+	/** Request ID for debugging */
+	requestId?: string;
+	/** Authentication mode used by the provider (e.g. oauth, api-key) */
+	authMode?: string;
+}

package/src/tools/web-search.ts

@@ -22,6 +22,7 @@ import {
 } from "../render/render-utils";
 import { renderStatusLine, renderTreeList, urlHyperlink } from "../render";
 import { framedToolCard } from "../render/tool-card";
+import { getSearchProviderLabel, type SearchResponse } from "./web-search-types";
 
 const MAX_COLLAPSED_ITEMS = PREVIEW_LIMITS.COLLAPSED_ITEMS;
 
@@ -246,175 +247,3 @@ export const webSearchToolRenderer = {
 	renderResult: renderSearchResult,
 	mergeCallAndResult: true,
 } satisfies ToolRenderer<{ query?: string; [key: string]: unknown }, SearchRenderDetails>;
-
-/**
- * Web Search Types
- *
- * Unified types for web search responses across supported providers.
- */
-
-export const SEARCH_PROVIDER_OPTIONS = [
-	{
-		value: "auto",
-		label: "Auto",
-		description: "Automatically uses the first configured web-search provider",
-	},
-	{
-		value: "parallel",
-		label: "Parallel",
-		description: "Uses API auth when configured; otherwise searches through the keyless public MCP",
-	},
-	{
-		value: "perplexity",
-		label: "Perplexity",
-		description: "Uses auth when configured; explicit selection falls back to anonymous search",
-	},
-	{
-		value: "gemini",
-		label: "Gemini",
-		description: "Google Search grounding via Gemini (uses google-gemini-cli or google-antigravity OAuth)",
-	},
-	{
-		value: "anthropic",
-		label: "Anthropic",
-		description: "Claude's native web_search tool (uses Anthropic OAuth or ANTHROPIC_API_KEY)",
-	},
-	{
-		value: "codex",
-		label: "OpenAI Codex",
-		description: "OpenAI's native web_search (uses ChatGPT OAuth via /login openai-codex)",
-	},
-	{
-		value: "openai",
-		label: "OpenAI API",
-		description:
-			"OpenAI hosted web_search via OPENAI_API_KEY or OpenAI API-key registry credentials; billed by API usage",
-	},
-	{
-		value: "xai",
-		label: "xAI",
-		description:
-			"Grok web search via xAI Responses API (uses SuperGrok/X Premium+ OAuth via /login xai-oauth, or XAI_API_KEY)",
-	},
-	{
-		value: "openrouter",
-		label: "OpenRouter",
-		description: "OpenRouter plugins-based web search with model-selected grounding",
-	},
-	{ value: "zai", label: "Z.AI", description: "Calls Z.AI webSearchPrime MCP" },
-	{ value: "exa", label: "Exa", description: "API via /login exa or EXA_API_KEY; explicit keyless fallback via MCP" },
-	{ value: "tinyfish", label: "TinyFish", description: "Requires TINYFISH_API_KEY" },
-	{ value: "jina", label: "Jina", description: "Requires JINA_API_KEY" },
-	{ value: "kagi", label: "Kagi", description: "Requires KAGI_API_KEY and Kagi Search API beta access" },
-	{ value: "tavily", label: "Tavily", description: "Requires TAVILY_API_KEY" },
-	{
-		value: "firecrawl",
-		label: "Firecrawl",
-		description: "Uses Firecrawl API when FIRECRAWL_API_KEY is set; falls back to keyless mode",
-	},
-	{ value: "brave", label: "Brave", description: "Requires BRAVE_API_KEY" },
-	{
-		value: "kimi",
-		label: "Kimi",
-		description:
-			"Kimi Code search (requires a Kimi Code Console key via KIMI_SEARCH_API_KEY/MOONSHOT_SEARCH_API_KEY or /login kimi-code; not MOONSHOT_API_KEY)",
-	},
-	{ value: "synthetic", label: "Synthetic", description: "Requires SYNTHETIC_API_KEY" },
-	{ value: "ollama", label: "Ollama", description: "Requires OLLAMA_CLOUD_API_KEY" },
-	{ value: "searxng", label: "SearXNG", description: "Requires SEARXNG_ENDPOINT or searxng.endpoint" },
-	{
-		value: "startpage",
-		label: "Startpage",
-		description: "Credential-free scrape of Startpage (Google-backed) results; may be bot-challenged",
-	},
-	{
-		value: "duckduckgo",
-		label: "DuckDuckGo",
-		description: "Credential-free best-effort fallback; may be bot-challenged on datacenter/shared-egress IPs",
-	},
-	{
-		value: "ecosia",
-		label: "Ecosia",
-		description: "Credential-free browser-backed scrape of Ecosia (Google-backed) results",
-	},
-	{
-		value: "google",
-		label: "Google",
-		description: "Credential-free browser-backed fallback; slower and may be bot-challenged",
-	},
-	{
-		value: "mojeek",
-		label: "Mojeek",
-		description: "Credential-free browser-backed scrape of Mojeek's independent index",
-	},
-	{
-		value: "public",
-		label: "Public Web",
-		description: "Queries every credential-free engine in parallel and consolidates deduplicated results",
-	},
-] as const;
-
-/** Supported web search providers (every option except `auto`). */
-export type SearchProviderId = Exclude<(typeof SEARCH_PROVIDER_OPTIONS)[number]["value"], "auto">;
-
-/** Display labels, derived from {@link SEARCH_PROVIDER_OPTIONS}. */
-export const SEARCH_PROVIDER_LABELS = Object.fromEntries(
-	SEARCH_PROVIDER_OPTIONS.flatMap(option => (option.value === "auto" ? [] : [[option.value, option.label] as const])),
-) as Record<SearchProviderId, string>;
-
-/** Source returned by search (all providers) */
-export interface SearchSource {
-	title: string;
-	url: string;
-	snippet?: string;
-	/** ISO date string or relative ("2d ago") */
-	publishedDate?: string;
-	/** Age in seconds for consistent formatting */
-	ageSeconds?: number;
-	author?: string;
-}
-
-/** Citation with text reference (LLM-mediated providers) */
-export interface SearchCitation {
-	url: string;
-	title: string;
-	citedText?: string;
-}
-
-/** Usage metrics */
-export interface SearchUsage {
-	inputTokens?: number;
-	outputTokens?: number;
-	/** Anthropic: number of web search requests made */
-	searchRequests?: number;
-	/** Perplexity: combined token count */
-	totalTokens?: number;
-}
-
-/** Unified response across providers */
-export interface SearchResponse {
-	provider: SearchProviderId | "none";
-	/** Synthesized answer text (LLM-mediated providers) */
-	answer?: string;
-	/** Search result sources */
-	sources: SearchSource[];
-	/** Text citations with context */
-	citations?: SearchCitation[];
-	/** Intermediate search queries (anthropic) */
-	searchQueries?: string[];
-	/** Follow-up question suggestions (provider-dependent) */
-	relatedQuestions?: string[];
-	/** Token usage metrics */
-	usage?: SearchUsage;
-	/** Model used */
-	model?: string;
-	/** Request ID for debugging */
-	requestId?: string;
-	/** Authentication mode used by the provider (e.g. oauth, api-key) */
-	authMode?: string;
-}
-
-/** Cheap, sync metadata accessor — never triggers a provider load. */
-export function getSearchProviderLabel(id: SearchProviderId): string {
-	return SEARCH_PROVIDER_LABELS[id] ?? id;
-}

package/src/tui.ts

@@ -1328,7 +1328,7 @@ export class TUI extends Container {
 				this.#beginResizeAltPaint();
 			},
 			() => this.stop(),
-			{ deferInput: this.#inputDeferred },
+			{ deferInput: this.#inputDeferred, isLoopStalled: () => this.#watchdog.isStalled() },
 		);
 		if (this.#stopped) return;
 		this.#cancelPostmortemRestore?.();

package/dist/types/setup/scenes/providers.d.ts

@@ -1,3 +0,0 @@
-import type { SetupScene } from "./types.js";
-/** Configure provider sign-in and the preferred web search backend. */
-export declare const providersSetupScene: SetupScene;

package/dist/types/setup/scenes/web-search.d.ts

@@ -1,22 +0,0 @@
-import { type SgrMouseEvent } from "../../mouse.js";
-import type { SetupSceneHost, SetupTab } from "./types.js";
-/**
- * "Web search" panel: picks the provider the web_search tool should prefer and
- * reports whether the highlighted provider is ready to use given current
- * credentials (env keys or OAuth sign-ins from the Sign in tab) or an
- * unauthenticated fallback.
- */
-export declare class WebSearchTab implements SetupTab {
-    #private;
-    readonly id = "web-search";
-    readonly label = "Web search";
-    readonly modal = false;
-    constructor(host: SetupSceneHost);
-    onActivate(): void;
-    handleInput(data: string): void;
-    /** Wheel moves the highlight; hover lights the row under the pointer; click confirms it. */
-    routeMouse(event: SgrMouseEvent, line: number, col: number): void;
-    invalidate(): void;
-    dispose(): void;
-    render(width: number, maxLines?: number): readonly string[];
-}

package/src/setup/scenes/providers.ts

@@ -1,110 +0,0 @@
-import { type SgrMouseEvent } from "../../mouse";
-import { TabBar } from "../../components/tab-bar";
-import { editorKey } from "../../chrome/keybinding-hints";
-import { getTabBarTheme } from "../../chrome/shared";
-import { SignInTab } from "./sign-in";
-import type { SetupScene, SetupSceneController, SetupSceneHost, SetupTab } from "./types";
-import { WebSearchTab } from "./web-search";
-
-/**
- * Tabbed "Set up your providers" scene. Composes independent panels (model
- * sign-in, web search) behind a {@link TabBar}; the active panel owns
- * rendering and input, while modal panels (e.g. an in-flight OAuth login)
- * temporarily suppress tab switching.
- */
-class ProvidersSceneController implements SetupSceneController {
-	title = "Set up your providers";
-	get subtitle(): string {
-		return `Sign in and pick a web search provider. Press ${editorKey("tui.select.cancel")} when you're done.`;
-	}
-
-	#tabs: SetupTab[];
-	#tabBar: TabBar;
-	/** Lines the tab bar occupied in the last render (body starts one blank line below). */
-	#tabRowCount = 1;
-
-	constructor(host: SetupSceneHost) {
-		this.#tabs = [new SignInTab(host), new WebSearchTab(host)];
-		this.#tabBar = new TabBar(
-			"Providers",
-			this.#tabs.map(tab => ({ id: tab.id, label: tab.label })),
-			getTabBarTheme(),
-		);
-		this.#tabBar.onTabChange = () => {
-			this.#activeTab().onActivate?.();
-			host.requestRender();
-		};
-	}
-
-	#activeTab(): SetupTab {
-		return this.#tabs[this.#tabBar.getActiveIndex()] ?? this.#tabs[0];
-	}
-
-	onMount(): void {
-		this.#activeTab().onActivate?.();
-	}
-
-	invalidate(): void {
-		for (const tab of this.#tabs) tab.invalidate();
-	}
-
-	handleInput(data: string): void {
-		const tab = this.#activeTab();
-		if (tab.modal) {
-			tab.handleInput(data);
-			return;
-		}
-		if (this.#tabBar.handleInput(data)) return;
-		tab.handleInput(data);
-	}
-
-	/**
-	 * Hit-test mouse reports against the last render: rows inside the tab bar
-	 * hover/switch tabs (suppressed while the active panel is modal, matching
-	 * keyboard tab cycling); everything else forwards to the active panel at
-	 * panel-local coordinates. Wheel always goes to the panel so scrolling
-	 * works regardless of pointer position.
-	 */
-	routeMouse(event: SgrMouseEvent, line: number, col: number): void {
-		const tab = this.#activeTab();
-		if (event.wheel === null && line >= 0 && line < this.#tabRowCount) {
-			if (tab.modal) return;
-			const hit = this.#tabBar.tabAt(line, col);
-			if (event.motion) {
-				this.#tabBar.setHoverTab(hit && !hit.muted ? hit.id : null);
-			} else if (event.leftClick && hit) {
-				this.#tabBar.selectTab(hit.id);
-			}
-			return;
-		}
-		if (event.motion) this.#tabBar.setHoverTab(null);
-		const spacerRowsAfterTabs = 1;
-		const bodyLine = line - this.#tabRowCount - spacerRowsAfterTabs;
-		if (tab.routeMouse) {
-			tab.routeMouse(event, bodyLine, col);
-			return;
-		}
-		if (event.wheel !== null && !tab.modal) {
-			tab.handleInput(event.wheel === -1 ? "\x1b[A" : "\x1b[B");
-		}
-	}
-
-	render(width: number, maxLines?: number): readonly string[] {
-		const tabLines = this.#tabBar.render(width);
-		this.#tabRowCount = tabLines.length;
-		const tabBudget = maxLines === undefined ? undefined : Math.max(1, maxLines - tabLines.length - 1);
-		return [...tabLines, "", ...this.#activeTab().render(width, tabBudget)];
-	}
-
-	dispose(): void {
-		for (const tab of this.#tabs) tab.dispose();
-	}
-}
-
-/** Configure provider sign-in and the preferred web search backend. */
-export const providersSetupScene: SetupScene = {
-	id: "providers",
-	title: "Set up your providers",
-	minVersion: 1,
-	mount: host => new ProvidersSceneController(host),
-};