@herbertgao/pi-extensions 2026.9.3 → 2026.9.5

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/tool/diff/diff-renderer.ts

@@ -50,9 +50,9 @@ interface DiffTheme {
 }
 
 type DiffLineKind = "add" | "remove" | "context";
-type DiffEntryKind = "line" | "meta" | "hunk" | "file";
+type DiffEntryKind = "line" | "omission" | "meta" | "hunk" | "file";
 
-interface DiffLineEntry {
+export interface DiffLineEntry {
 	kind: "line";
 	lineKind: DiffLineKind;
 	oldLineNumber: number | null;
@@ -64,15 +64,21 @@ interface DiffLineEntry {
 	hunkIndex: number;
 }
 
+export interface DiffOmissionEntry {
+	kind: "omission";
+	raw: string;
+	hunkIndex: number;
+}
+
 interface DiffMetaEntry {
-	kind: Exclude<DiffEntryKind, "line">;
+	kind: Exclude<DiffEntryKind, "line" | "omission">;
 	raw: string;
 	hunkIndex: number;
 }
 
-type ParsedDiffEntry = DiffLineEntry | DiffMetaEntry;
+type ParsedDiffEntry = DiffLineEntry | DiffOmissionEntry | DiffMetaEntry;
 
-interface ParsedDiff {
+export interface ParsedDiff {
 	entries: ParsedDiffEntry[];
 	stats: DiffStats;
 }
@@ -94,6 +100,7 @@ interface RenderedRow {
 interface SplitDiffRow {
 	left?: DiffLineEntry;
 	right?: DiffLineEntry;
+	omission?: DiffOmissionEntry;
 	meta?: DiffMetaEntry;
 	hunkIndex: number | null;
 }
@@ -131,7 +138,9 @@ type CodeLineHighlighter = (line: string, entry: DiffLineEntry) => string;
 
 const CANONICAL_LINE_PATTERN = /^([+\- ])(\s*\d+)\|(.*)$/;
 const HASHLINE_ANCHOR_LINE_PATTERN = /^([+\- ])(\s*\d+)#([A-Za-z0-9]+| {2}):(.*)$/;
+// Pi 仍使用空格分隔的行号格式；仅在无 hunk 头时可安全识别。
 const LEGACY_LINE_PATTERN = /^([+\- ])(\s*\d+)\s(.*)$/;
+const PI_OMISSION_LINE_PATTERN = /^ {3,}\.\.\.$/;
 const HUNK_HEADER_PATTERN = /^@@\s+-(\d+)(?:,(\d+))?\s+\+(\d+)(?:,(\d+))?\s+@@(.*)$/;
 const SPLIT_SEPARATOR = " │ ";
 const MIN_LINE_NUMBER_WIDTH = 2;
@@ -374,7 +383,10 @@ function toParsedDiffLine(
 	return { lineKind: "context", lineNumber: normalizedLineNumber, content };
 }
 
-function parseCanonicalDiffLine(line: string): {
+function parseCanonicalDiffLine(
+	line: string,
+	allowPiFormat: boolean,
+): {
 	lineKind: DiffLineKind;
 	lineNumber: string;
 	content: string;
@@ -393,7 +405,7 @@ function parseCanonicalDiffLine(line: string): {
 	}
 
 	const canonicalMatch = line.match(CANONICAL_LINE_PATTERN);
-	const legacyMatch = canonicalMatch ? null : line.match(LEGACY_LINE_PATTERN);
+	const legacyMatch = canonicalMatch || !allowPiFormat ? null : line.match(LEGACY_LINE_PATTERN);
 	const matched = canonicalMatch ?? legacyMatch;
 	if (!matched) {
 		return null;
@@ -486,7 +498,7 @@ function ensureImplicitHunk(currentHunk: number): number {
 	return currentHunk > 0 ? currentHunk : 1;
 }
 
-function parseDiff(diffText: string): ParsedDiff {
+export function parseDiff(diffText: string): ParsedDiff {
 	const stats: DiffStats = {
 		added: 0,
 		removed: 0,
@@ -505,12 +517,14 @@ function parseDiff(diffText: string): ParsedDiff {
 	let oldLineCursor: number | null = null;
 	let newLineCursor: number | null = null;
 	let lineNumberDelta = 0;
+	let hasHunkHeader = false;
 
 	for (const rawLine of diffText.replace(/\r/g, "").split("\n")) {
 		stats.lines++;
 
 		const hunkMatch = rawLine.match(HUNK_HEADER_PATTERN);
 		if (hunkMatch) {
+			hasHunkHeader = true;
 			hunkIndex++;
 			stats.hunks = Math.max(stats.hunks, hunkIndex);
 			oldLineCursor = toNumber(hunkMatch[1]);
@@ -535,7 +549,14 @@ function parseDiff(diffText: string): ParsedDiff {
 			lineNumberDelta = 0;
 		}
 
-		const canonical = parseCanonicalDiffLine(rawLine);
+		// Pi 用空白行号填充省略上下文；它不是源码行，也不推进行号游标。
+		if (!hasHunkHeader && PI_OMISSION_LINE_PATTERN.test(rawLine)) {
+			entries.push({ kind: "omission", raw: rawLine, hunkIndex });
+			continue;
+		}
+
+		// Pi 无 hunk 头时的数字行号与 unified hunk 中的数字源码文本存在歧义。
+		const canonical = parseCanonicalDiffLine(rawLine, !hasHunkHeader);
 		if (canonical) {
 			hunkIndex = ensureImplicitHunk(hunkIndex);
 			stats.hunks = Math.max(stats.hunks, hunkIndex);
@@ -802,6 +823,12 @@ function buildSplitRows(entries: ParsedDiffEntry[]): SplitDiffRow[] {
 			break;
 		}
 
+		if (entry.kind === "omission") {
+			rows.push({ omission: entry, hunkIndex: entry.hunkIndex || null });
+			index++;
+			continue;
+		}
+
 		if (entry.kind !== "line") {
 			rows.push({ meta: entry, hunkIndex: entry.hunkIndex || null });
 			index++;
@@ -1785,8 +1812,44 @@ interface DiffRenderContext {
 	showHashlineAnchors: boolean;
 }
 
-function processDiffEntries(
+const OMISSION_GLYPH = "⋮";
+
+function createOmissionRenderLine(entry: DiffOmissionEntry, compact = false): DiffLineEntry {
+	return {
+		kind: "line",
+		lineKind: "context",
+		oldLineNumber: null,
+		newLineNumber: null,
+		fallbackLineNumber: compact ? "" : OMISSION_GLYPH,
+		content: compact ? OMISSION_GLYPH : "",
+		raw: entry.raw,
+		hunkIndex: entry.hunkIndex,
+	};
+}
+
+function materializeOmissionEntries(
 	entries: ParsedDiffEntry[],
+	compact = false,
+): (DiffLineEntry | DiffMetaEntry)[] {
+	return entries.map((entry) =>
+		entry.kind === "omission" ? createOmissionRenderLine(entry, compact) : entry,
+	);
+}
+
+function omitTerminalOmissions(entries: ParsedDiffEntry[]): ParsedDiffEntry[] {
+	let lastLineIndex = -1;
+	for (let index = entries.length - 1; index >= 0; index--) {
+		if (entries[index]?.kind === "line") {
+			lastLineIndex = index;
+			break;
+		}
+	}
+
+	return entries.filter((entry, index) => entry.kind !== "omission" || index < lastLineIndex);
+}
+
+function processDiffEntries(
+	entries: (DiffLineEntry | DiffMetaEntry)[],
 	ctx: DiffRenderContext,
 	processLine: (entry: DiffLineEntry) => string[],
 ): RenderedRow[] {
@@ -1807,7 +1870,7 @@ function renderUnified(
 	ctx: DiffRenderContext,
 	lineNumberWidth: number,
 ): RenderedRow[] {
-	return processDiffEntries(entries, ctx, (entry) => {
+	return processDiffEntries(materializeOmissionEntries(entries), ctx, (entry) => {
 		const lineNumber =
 			entry.lineKind === "add"
 				? formatLineNumberLabel(
@@ -1857,6 +1920,10 @@ function toUnifiedFallbackRows(
 ): RenderedRow[] {
 	const flattened: ParsedDiffEntry[] = [];
 	for (const row of rows) {
+		if (row.omission) {
+			flattened.push(row.omission);
+			continue;
+		}
 		if (row.meta) {
 			flattened.push(row.meta);
 			continue;
@@ -1872,7 +1939,7 @@ function toUnifiedFallbackRows(
 }
 
 function renderCompact(entries: ParsedDiffEntry[], ctx: DiffRenderContext): RenderedRow[] {
-	return processDiffEntries(entries, ctx, (entry) => {
+	return processDiffEntries(materializeOmissionEntries(entries, true), ctx, (entry) => {
 		const codeText = normalizeCodeWhitespace(
 			getCompactLineRenderContent(entry, ctx.showHashlineAnchors),
 		);
@@ -2091,8 +2158,9 @@ function renderSplit(
 			continue;
 		}
 
+		const omissionLine = row.omission ? createOmissionRenderLine(row.omission) : undefined;
 		const leftCells = renderSplitCell(
-			row.left,
+			omissionLine ?? row.left,
 			"left",
 			leftWidth,
 			splitLineNumberWidth,
@@ -2106,7 +2174,7 @@ function renderSplit(
 			showHashlineAnchors,
 		);
 		const rightCells = renderSplitCell(
-			row.right,
+			omissionLine ?? row.right,
 			"right",
 			rightWidth,
 			splitLineNumberWidth,
@@ -2561,18 +2629,19 @@ export function renderEditDiffResult(
 		return new Text(theme.fg("muted", "↳ no diff data"), 0, 0);
 	}
 
-	const splitRows = buildSplitRows(parsed.entries);
+	const renderEntries = omitTerminalOmissions(parsed.entries);
+	const splitRows = buildSplitRows(renderEntries);
 	const showHashlineAnchors =
 		options.expanded === true &&
-		parsed.entries.some((entry) => entry.kind === "line" && !!entry.hashlineAnchorContent);
-	const lineNumberWidth = getLineNumberWidth(parsed.entries, showHashlineAnchors);
+		renderEntries.some((entry) => entry.kind === "line" && !!entry.hashlineAnchorContent);
+	const lineNumberWidth = getLineNumberWidth(renderEntries, showHashlineAnchors);
 	const palette = resolveDiffPalette(theme);
 	// Rich diffs use ccstyle's self shell. Keep the panel transparent so the
 	// separator cannot leak toolSuccessBg across the entire new column.
 	const containerBgAnsi = undefined;
 	const language = resolveLanguageFromPath(options.filePath);
 	const cache = createDiffRenderCache();
-	const highlightLine = createCodeLineHighlighter(language, theme, parsed.entries, () => {
+	const highlightLine = createCodeLineHighlighter(language, theme, renderEntries, () => {
 		cache.invalidate();
 		options.invalidate?.();
 	});
@@ -2621,7 +2690,7 @@ export function renderEditDiffResult(
 			const processBudget = resolveDiffProcessBudget(displayLimit, wordWrap);
 			// Only highlight/render a prefix that can fill the display limit; full-diff
 			// LCS + syntax highlight on thousands of hidden lines is pure waste when collapsed.
-			const entryBudget = takeEntriesForLineBudget(parsed.entries, processBudget);
+			const entryBudget = takeEntriesForLineBudget(renderEntries, processBudget);
 			const splitBudget = takeSplitRowsForBudget(splitRows, processBudget);
 			const inlineHighlights = buildInlineHighlightMap(splitBudget.rows);
 			const renderCtx: DiffRenderContext = {

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/tool/grouping.ts

@@ -8,6 +8,7 @@ import {
 } from "@earendil-works/pi-tui";
 import { TOOL_LOADING_INTERVAL_MS, toolLoadingIcon } from "../../utils/tool-loading-icon.ts";
 import { sanitizeToolResultText } from "../../utils/tool-result-sanitize.ts";
+import { fitToolCallSummary, pathSummary, type ToolCallSummary } from "./result.ts";
 import { isToolTuiFullscreen, showMoreHintText } from "../show-more-hint.ts";
 
 const PATCH_KEY = Symbol.for("pi.ccstyle.tool-grouping-patch");
@@ -172,7 +173,7 @@ function humanizeToolName(name: string): string {
 		.replace(/\b\w/g, (char) => char.toUpperCase());
 }
 
-function toolSummary(tool: any): { main: string; detail: string } {
+function toolSummary(tool: any): ToolCallSummary {
 	const name = toolName(tool);
 	const lowerName = name.toLowerCase();
 	const args = tool?.args ?? {};
@@ -232,10 +233,11 @@ function toolSummary(tool: any): { main: string; detail: string } {
 			args.offset !== undefined ? `offset=${args.offset}` : "",
 			args.limit !== undefined ? `limit=${args.limit}` : "",
 		].filter(Boolean);
-		return {
-			main: `Read ${oneLine(args.path || "...")}`,
-			detail: details.length ? ` (${details.join(", ")})` : "",
-		};
+		const detail = details.length ? ` (${details.join(", ")})` : "";
+		if (typeof args.path === "string" && args.path) {
+			return pathSummary("Read", args.path, tool?.cwd, detail);
+		}
+		return { main: "Read ...", detail };
 	}
 	if (name === "bash") return { main: `Bash ${oneLine(args.command || "...")}`, detail: "" };
 	if (name === "grep") {
@@ -456,11 +458,14 @@ export class ToolGroupComponent extends Container {
 			const continuation = index === total - 1 ? "  " : "│ ";
 			if (!this._expanded) {
 				const summary = toolSummary(tool);
+				const prefix = ` ${fg("dim", branch)} ${fg(color, statusIcon(toolStatus))} `;
+				const detail = fg("dim", summary.detail);
+				const mainWidth = Math.max(0, width - visibleWidth(prefix) - visibleWidth(detail));
 				lines.push(
 					truncateToWidth(
-						` ${fg("dim", branch)} ${fg(color, statusIcon(toolStatus))} ${fg("toolTitle", summary.main)}${fg("dim", summary.detail)}`,
+						`${prefix}${fg("toolTitle", fitToolCallSummary(summary, mainWidth))}${detail}`,
 						width,
-						"…",
+						"",
 					),
 				);
 				continue;

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/tool/result.ts

@@ -1,4 +1,5 @@
 import { Text, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
+import { posix, win32 } from "node:path";
 import { inspect } from "node:util";
 import { config } from "../../config/config.ts";
 import { showMoreHintText } from "../show-more-hint.ts";
@@ -557,6 +558,103 @@ export function middleTruncateToWidth(text: string, width: number): string {
 	return `${left}…${right}`;
 }
 
+export type ToolCallSummary = {
+	main: string;
+	detail: string;
+	/** 路径摘要保留结构，供最终渲染按实际宽度优先保留文件名。 */
+	path?: { prefix: string; value: string };
+};
+
+function pathApi(value: string) {
+	if (win32.isAbsolute(value)) return win32;
+	if (posix.isAbsolute(value)) return posix;
+	return undefined;
+}
+
+/** cwd 内绝对路径转相对路径；cwd 外路径保持不变。 */
+export function displayPath(value: unknown, cwd?: string): string {
+	const text = oneLine(value, 4096);
+	const base = cwd ? oneLine(cwd, 4096) : "";
+	const api = pathApi(text);
+	if (!api || !base || !api.isAbsolute(base)) return text;
+	const relative = api.relative(base, text);
+	if (!relative) return api.basename(text) || ".";
+	if (relative === ".." || relative.startsWith(`..${api.sep}`) || api.isAbsolute(relative)) {
+		return text;
+	}
+	return relative;
+}
+
+function headToWidth(text: string, width: number, ellipsis = ""): string {
+	if (visibleWidth(text) <= width) return text;
+	if (width <= 0) return "";
+	const suffix = visibleWidth(ellipsis) <= width ? ellipsis : "";
+	const contentWidth = width - visibleWidth(suffix);
+	let head = "";
+	for (const char of Array.from(text)) {
+		if (visibleWidth(head + char) > contentWidth) break;
+		head += char;
+	}
+	return head + suffix;
+}
+
+function tailToWidth(text: string, width: number): string {
+	if (width <= 0) return "";
+	let tail = "";
+	for (const char of Array.from(text).reverse()) {
+		if (visibleWidth(char + tail) > width) break;
+		tail = char + tail;
+	}
+	return tail;
+}
+
+/** 中间截断路径：目录保留开头，末尾优先完整保留文件名。 */
+export function truncatePathToWidth(path: string, width: number): string {
+	if (visibleWidth(path) <= width) return path;
+	if (width <= 1) return width === 1 ? "…" : "";
+	const separatorIndex = Math.max(path.lastIndexOf("/"), path.lastIndexOf("\\"));
+	const filename = separatorIndex >= 0 ? path.slice(separatorIndex + 1) : path;
+	const filenameWidth = visibleWidth(filename);
+	if (separatorIndex >= 0 && filenameWidth + 1 <= width) {
+		const separator = path[separatorIndex]!;
+		const suffix = `${separator}${filename}`;
+		const prefixWidth = width - visibleWidth(suffix) - 1;
+		const prefix = headToWidth(path.slice(0, separatorIndex), Math.max(0, prefixWidth));
+		return `${prefix}…${prefix ? suffix : filename}`;
+	}
+	const leftWidth = Math.max(1, Math.floor((width - 1) * 0.45));
+	const rightWidth = Math.max(0, width - leftWidth - 1);
+	return `${headToWidth(filename, leftWidth)}…${tailToWidth(filename, rightWidth)}`;
+}
+
+/** 路径展示的统一入口：相对化后按当前可用宽度中间截断。 */
+export function formatDisplayPath(value: unknown, cwd: string | undefined, width: number): string {
+	return truncatePathToWidth(displayPath(value, cwd), Math.max(0, Math.floor(width)));
+}
+
+/** 按最终终端宽度渲染摘要；路径摘要不会再被整行头部截断。 */
+export function fitToolCallSummary(summary: ToolCallSummary, width: number): string {
+	if (!summary.path) return headTruncateToWidth(summary.main, width);
+	const prefix = summary.path.prefix;
+	const pathWidth = Math.max(0, width - visibleWidth(prefix) - 1);
+	if (pathWidth <= 0) return headTruncateToWidth(prefix, width);
+	return `${prefix} ${truncatePathToWidth(summary.path.value, pathWidth)}`;
+}
+
+export function pathSummary(
+	prefix: string,
+	value: unknown,
+	cwd: string | undefined,
+	detail = "",
+): ToolCallSummary {
+	const path = displayPath(value, cwd);
+	return {
+		main: `${prefix} ${path}`,
+		detail,
+		path: { prefix, value: path },
+	};
+}
+
 /** Pretty-print tool call args for the expanded Input section. */
 export function formatToolInputArgs(args: unknown, maxChars = 8_000): string {
 	if (args === undefined || args === null) return "";

package/node_modules/@herbertgao/pi-cc-extensions/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@herbertgao/pi-cc-extensions",
-	"version": "0.9.0",
+	"version": "0.9.2",
 	"license": "MIT",
 	"description": "A Pi productivity suite with Claude Code-style UI, context inspection, and agent/session references",
 	"type": "module",
@@ -69,8 +69,8 @@
 	},
 	"x-upstream": {
 		"package": "pi-cc-extensions",
-		"version": "0.8.69",
+		"version": "0.8.71",
 		"repository": "https://github.com/minuque/pi-cc-extensions",
-		"commit": "5d7a2666f51da9f450bd019af10200c88cc1df98"
+		"commit": "e43e0041b59f5d7f03be9b9d103a5f9e954e4c11"
 	}
 }

package/node_modules/@herbertgao/sol-pi/src/sol-pi/extensions/online-context-compact/economics.ts

@@ -218,9 +218,8 @@ export function decideCompaction(input: {
 		carriedDebtTokens: input.carriedDebtTokens,
 		cacheDebtRepaymentTokens: input.cacheDebtRepaymentTokens,
 		compact,
-		reason: !compressible
-			? "non_positive_saving"
-			: windowProtection
+		reason: compressible
+			? windowProtection
 				? "window_protection"
 				: economic
 					? "economic"
@@ -232,6 +231,7 @@ export function decideCompaction(input: {
 								? "deferred_subsequent_margin"
 								: !firstCompaction && baseEconomic && !carriedDebtGateOpen
 									? "deferred_carried_debt"
-									: "deferred_economic",
+									: "deferred_economic"
+			: "non_positive_saving",
 	};
 }

package/node_modules/@herbertgao/sol-pi/src/sol-pi/extensions/online-context-compact/extension.ts

@@ -2,12 +2,13 @@
  * SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: MIT
  */
-import type { AgentMessage, AgentToolResult } from "@earendil-works/pi-agent-core";
+import type { AgentMessage, AgentToolResult, ThinkingLevel } from "@earendil-works/pi-agent-core";
 import {
 	buildSessionContext,
 	estimateTokens,
 	findCutPoint,
 	sessionEntryToContextMessages,
+	type ExtensionAPI,
 	type ExtensionContext,
 	type ExtensionFactory,
 	type SessionEntry,
@@ -165,6 +166,37 @@ function validPositiveInteger(value: unknown): value is number {
 	return typeof value === "number" && Number.isSafeInteger(value) && value > 0;
 }
 
+type CompactionThinkingOverride = {
+	readonly previous: ThinkingLevel;
+	readonly applied: ThinkingLevel;
+};
+
+// Native summaries share their output cap with reasoning; reserve the cap for summary text.
+function lowerCompactionThinking(
+	pi: ExtensionAPI,
+	reasoning: boolean,
+): CompactionThinkingOverride | undefined {
+	if (!reasoning) return;
+	try {
+		const previous = pi.getThinkingLevel();
+		if (previous !== "high" && previous !== "xhigh" && previous !== "max") return;
+		pi.setThinkingLevel("medium");
+		const applied = pi.getThinkingLevel();
+		return applied === previous ? undefined : { previous, applied };
+	} catch {
+		return;
+	}
+}
+
+function restoreCompactionThinking(pi: ExtensionAPI, override: CompactionThinkingOverride | undefined): void {
+	if (!override) return;
+	try {
+		if (pi.getThinkingLevel() === override.applied) pi.setThinkingLevel(override.previous);
+	} catch {
+		// A compaction result must not be masked by a best-effort state restore.
+	}
+}
+
 function releaseParentContinuation(continuation: PendingContinuation | undefined): void {
 	if (continuation) setTimeout(continuation.resolve, 0);
 }
@@ -182,6 +214,7 @@ export function createOnlineContextCompactExtension(options: OnlineContextCompac
 		let activeDebt: CacheDebt | undefined;
 		let nextContinuation: PendingContinuation | undefined;
 		let compactionInFlight = false;
+		let compactionThinkingOverride: CompactionThinkingOverride | undefined;
 
 		const releaseContinuation = (): void => {
 			const continuation = nextContinuation;
@@ -349,6 +382,7 @@ export function createOnlineContextCompactExtension(options: OnlineContextCompac
 			let compactionError: Error | undefined;
 			try {
 				compactionInFlight = true;
+				compactionThinkingOverride = lowerCompactionThinking(pi, context.model?.reasoning === true);
 				await new Promise<void>((resolve) => {
 					let finished = false;
 					const finish = (): void => {
@@ -382,6 +416,8 @@ export function createOnlineContextCompactExtension(options: OnlineContextCompac
 						},
 					});
 				});
+				restoreCompactionThinking(pi, compactionThinkingOverride);
+				compactionThinkingOverride = undefined;
 				compactionInFlight = false;
 				if (
 					compactionError &&
@@ -422,6 +458,8 @@ export function createOnlineContextCompactExtension(options: OnlineContextCompac
 					await continuation.promise;
 				}
 			} finally {
+				restoreCompactionThinking(pi, compactionThinkingOverride);
+				compactionThinkingOverride = undefined;
 				compactionInFlight = false;
 				activeDebt = undefined;
 				releaseParentContinuation(parentContinuation);
@@ -445,6 +483,8 @@ export function createOnlineContextCompactExtension(options: OnlineContextCompac
 		});
 
 		pi.on("session_shutdown", () => {
+			restoreCompactionThinking(pi, compactionThinkingOverride);
+			compactionThinkingOverride = undefined;
 			releaseContinuation();
 			pendingBoundary = undefined;
 			selected = undefined;

package/node_modules/@juicesharp/rpiv-ask-user-question/ask-user-question.ts

@@ -18,6 +18,7 @@ import {
 import { type DialogUI, hasDialogUI, runRpcQuestionnaire } from "./rpc-fallback.js";
 import { displayLabel, t } from "./state/i18n-bridge.js";
 import { sentinelsToAppend } from "./state/row-intent.js";
+import { normalizeQuestionParams } from "./tool/normalize-params.js";
 import { buildQuestionnaireResponse, buildToolResult } from "./tool/response-envelope.js";
 import {
 	MAX_OPTIONS,
@@ -310,7 +311,10 @@ export function registerAskUserQuestionTool(pi: ExtensionAPI): void {
 		parameters: QuestionParamsSchema,
 
 		async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
-			const typed = params as unknown as QuestionParams;
+			// Line-terminator normalization runs once here, ahead of validation, so
+			// every downstream consumer — validator, TUI, RPC walker, envelope, prompt
+			// event — sees the same clean text (#192).
+			const typed = normalizeQuestionParams(params as unknown as QuestionParams);
 			if (!ctx.hasUI) return rejectWithoutUi();
 
 			const validation = validateQuestionnaire(typed);

package/node_modules/@juicesharp/rpiv-ask-user-question/events.ts

@@ -38,7 +38,11 @@ export interface AskUserBlockedEventPayload {
 }
 
 export interface AskUserPromptQuestion {
-	/** The full question text, exactly as the agent authored it. */
+	/**
+	 * The full question text as the agent authored it, with line terminators
+	 * normalized at tool entry (`\r\n` → `\n`, lone `\r` removed — #192). The
+	 * same normalization applies to `header` and every option field below.
+	 */
 	question: string;
 	/** The short chip/tag shown next to the question. */
 	header: string;

package/node_modules/@juicesharp/rpiv-ask-user-question/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@juicesharp/rpiv-ask-user-question",
-	"version": "2.9.0",
+	"version": "2.10.1",
 	"description": "Pi extension. A structured questionnaire the model can put to you when it would otherwise guess, with typed options instead of free-form replies.",
 	"keywords": [
 		"pi-package",
@@ -56,6 +56,7 @@
 		"state/state-reducer.ts",
 		"state/state.ts",
 		"tool/format-answer.ts",
+		"tool/normalize-params.ts",
 		"tool/response-envelope.ts",
 		"tool/types.ts",
 		"tool/validate-questionnaire.ts",
@@ -94,7 +95,7 @@
 		}
 	},
 	"dependencies": {
-		"@juicesharp/rpiv-config": "^2.9.0",
+		"@juicesharp/rpiv-config": "^2.10.1",
 		"typebox": "^1.1.24"
 	}
 }

package/node_modules/@juicesharp/rpiv-ask-user-question/tool/normalize-params.ts

@@ -0,0 +1,56 @@
+import type { QuestionParams } from "./types.js";
+
+/**
+ * Normalize line terminators in one model-supplied text field (#192).
+ *
+ * Some models serialize a bare carriage return inside tool-call string
+ * arguments at token boundaries where the text was meant to be contiguous
+ * (`GEMBA\r_LOG\r_FILE` for `GEMBA_LOG_FILE`). A raw CR is a cursor-control
+ * byte, not text: pi-tui ≤0.80 writes it straight into the row, so the
+ * terminal returns to column 0 and later text overwrites the pointer and
+ * number; pi-tui ≥0.84 splits `wrapTextWithAnsi` on `\r`, so one option
+ * fragments into stacked rows. Both symptoms have the same fix at our
+ * boundary:
+ *
+ * - `\r\n` → `\n` keeps genuine multi-line content (preview markdown) intact.
+ * - a lone `\r` is deleted — never a space (phantom gaps inside words) and
+ *   never `\n` (reintroduces the vertical fragmentation). This matches
+ *   pi-coding-agent's own display normalization (`normalizeDisplayText`).
+ */
+export function normalizeLineTerminators(text: string): string {
+	return text.replace(/\r\n/g, "\n").replace(/\r/g, "");
+}
+
+/**
+ * Copy `obj`, normalizing the listed keys that hold strings. Keys absent from
+ * `obj` (e.g. an omitted `preview`) stay absent so `"preview" in option`
+ * checks and `hasPreview` derivations are unchanged.
+ */
+function normalizeStringFields<T extends object>(obj: T, keys: readonly (keyof T)[]): T {
+	const out = { ...obj };
+	for (const key of keys) {
+		const value = obj[key];
+		if (typeof value === "string") out[key] = normalizeLineTerminators(value) as T[typeof key];
+	}
+	return out;
+}
+
+/**
+ * Return a copy of the tool params with every user-facing string field
+ * (`question`, `header`, `options[].label`, `options[].description`,
+ * `options[].preview`) line-terminator-normalized. Runs once at tool entry,
+ * BEFORE `validateQuestionnaire`, so the reserved-label and duplicate-label
+ * guards compare the text the user will actually see (`"Other\r"` must not
+ * slip past `reserved_label`), and so the TUI, the RPC dialog walker, the
+ * envelope echo, and the `rpiv:ask-user:prompt` payload all carry the same
+ * clean text. Pure: the input object is never mutated.
+ */
+export function normalizeQuestionParams(params: QuestionParams): QuestionParams {
+	return {
+		...params,
+		questions: params.questions.map((q) => ({
+			...normalizeStringFields(q, ["question", "header"]),
+			options: q.options.map((o) => normalizeStringFields(o, ["label", "description", "preview"])),
+		})),
+	};
+}

package/node_modules/@juicesharp/rpiv-ask-user-question/view/components/option-list-view.ts

@@ -13,7 +13,7 @@ export interface OptionListViewConfig {
 }
 
 /**
- * Per-tick projection of OptionListView state. After Phase 11b, `inputBuffer`
+ * Per-tick projection of OptionListView state. `inputBuffer`
  * is part of the props bag — the session-owned `inlineInput` (a headless
  * `pi-tui` Editor instance) supplies its current `getText()` here per tick.
  * `OptionListView` is purely props-driven; the imperative buffer surface and