jeopi-cli 16.4.3 → 16.4.4

package/src/session/agent-session.ts

@@ -144,13 +144,16 @@ import {
 	AdvisorEmissionGuard,
 	type AdvisorMessageDetails,
 	type AdvisorNote,
+	AdvisorOutputQuarantinedError,
 	AdvisorRuntime,
 	type AdvisorSeverity,
 	AdvisorTranscriptRecorder,
 	advisorTranscriptFilename,
+	buildAdvisorQuarantineSourceText,
 	formatAdvisorBatchContent,
 	isAdvisorInterruptImmuneTurnActive,
 	isInterruptingSeverity,
+	quarantineAdvisorUnsafeOutput,
 	resolveAdvisorDeliveryChannel,
 	slugifyAdvisorName,
 } from "../advisor";
@@ -1445,6 +1448,20 @@ function isDisplayableQueuedMessage(message: AgentMessage): boolean {
 function isAdvisorCard(message: AgentMessage): message is CustomMessage {
 	return message.role === "custom" && message.customType === "advisor";
 }
+function isTerminalTextAssistantAnswer(message: AgentMessage | undefined): message is AssistantMessage {
+	if (message?.role !== "assistant" || message.stopReason !== "stop") return false;
+	let hasText = false;
+	for (const part of message.content) {
+		if (part.type === "toolCall") return false;
+		if (part.type === "text") {
+			if (part.text.trim().length > 0) hasText = true;
+			continue;
+		}
+		if (part.type === "thinking") continue;
+		return false;
+	}
+	return hasText;
+}
 
 /**
  * A queued message the user can restore to the editor / pull back as a draft.
@@ -1887,6 +1904,7 @@ export class AgentSession {
 	// Cursor exec, TUI listeners) is held back. Without this, a client that resumes
 	// on `agent_end` can fire its next `prompt` before #promptWithMessage's finally
 	#emptyStopRetryCount = 0;
+	#acceptTerminalEmptyStopForPrompt = false;
 	#unexpectedStopRetryCount = 0;
 	#promptGeneration = 0;
 	#pendingAgentEndEmit: AgentSessionEvent | undefined;
@@ -2475,6 +2493,14 @@ export class AgentSession {
 
 			const names = config.tools === undefined ? ADVISOR_DEFAULT_TOOL_NAMES : new Set(config.tools);
 			const tools = (this.#advisorTools ?? []).filter(t => names.has(t.name));
+			const availableAdvisorToolNames = new Set<string>();
+			availableAdvisorToolNames.add(adviseTool.name);
+			for (const tool of tools) {
+				availableAdvisorToolNames.add(tool.name);
+				if (tool.customWireName !== undefined) availableAdvisorToolNames.add(tool.customWireName);
+			}
+			let quarantinedAdvisorOutput: string | undefined;
+			let currentAdvisorInput = "";
 
 			const advisorSessionId = this.#advisorSessionId(slug);
 			const appendOnlyContext = new AppendOnlyContextManager();
@@ -2519,6 +2545,13 @@ export class AgentSession {
 				streamFn: this.#advisorStreamFn,
 				onPayload: this.#onPayload,
 				onResponse: this.#onResponse,
+				transformAssistantMessage: message => {
+					quarantinedAdvisorOutput = quarantineAdvisorUnsafeOutput(
+						message,
+						availableAdvisorToolNames,
+						buildAdvisorQuarantineSourceText(currentAdvisorInput, advisorAgent.state.messages),
+					);
+				},
 				onSseEvent: this.#onSseEvent,
 				transformProviderContext: this.#transformProviderContext,
 				intentTracing: false,
@@ -2529,7 +2562,19 @@ export class AgentSession {
 			advisorAgent.setDisableReasoning(shouldDisableReasoning(advisorThinkingLevel));
 
 			const advisorAgentFacade: AdvisorAgent = {
-				prompt: input => advisorAgent.prompt(input),
+				prompt: async input => {
+					let quarantined: string | undefined;
+					try {
+						quarantinedAdvisorOutput = undefined;
+						currentAdvisorInput = input;
+						await advisorAgent.prompt(input);
+						quarantined = quarantinedAdvisorOutput;
+					} finally {
+						quarantinedAdvisorOutput = undefined;
+						currentAdvisorInput = "";
+					}
+					if (quarantined) throw new AdvisorOutputQuarantinedError(quarantined);
+				},
 				abort: reason => advisorAgent.abort(reason),
 				reset: () => {
 					advisorAgent.reset();
@@ -2635,15 +2680,23 @@ export class AgentSession {
 		return slug ? `${this.sessionId}-advisor-${slug}` : `${this.sessionId}-advisor`;
 	}
 
+	#hasTerminalTextAnswerWithoutQueuedWork(): boolean {
+		if (this.agent.hasQueuedMessages() || this.#pendingNextTurnMessages.length > 0) return false;
+		return isTerminalTextAssistantAnswer(this.agent.state.messages.at(-1));
+	}
+
 	/**
 	 * Route one accepted advice note from `advisor` to the primary. Concern and
 	 * blocker interrupt the running agent through the steering channel; once the
-	 * loop has yielded, `triggerTurn` resumes it. After a deliberate user interrupt
-	 * auto-resume is suppressed while idle/unwinding (the note becomes a preserved
-	 * card re-entering on resume); a live-streaming turn is steered in directly. A
-	 * plain nit always rides the non-interrupting YieldQueue aside. Suppression by
-	 * the per-advisor emission guard drops the note silently — the model still saw
-	 * `Recorded.`, so it isn't tempted to rephrase the same note past the dedupe.
+	 * loop has yielded, `triggerTurn` resumes it. If the loop already ended with a
+	 * terminal text answer and no queued work remains, the note is preserved as an
+	 * advisor card instead of waking a duplicate completion turn. After a deliberate
+	 * user interrupt auto-resume is suppressed while idle/unwinding (the note
+	 * becomes a preserved card re-entering on resume); a live-streaming turn is
+	 * steered in directly. A plain nit always rides the non-interrupting YieldQueue
+	 * aside. Suppression by the per-advisor emission guard drops the note silently —
+	 * the model still saw `Recorded.`, so it isn't tempted to rephrase the same note
+	 * past the dedupe.
 	 */
 	#routeAdvice(advisor: ActiveAdvisor, note: string, severity?: AdvisorSeverity): void {
 		if (!advisor.emissionGuard.accept(note)) {
@@ -2663,6 +2716,7 @@ export class AgentSession {
 			streaming: this.agent.state.isStreaming,
 			aborting: this.#abortInProgress,
 			interruptImmuneTurnActive: interrupting && this.#isAdvisorInterruptImmuneTurnActive(),
+			terminalAnswerNoQueuedWork: this.#hasTerminalTextAnswerWithoutQueuedWork(),
 		});
 		if (channel === "aside") {
 			this.yieldQueue.enqueue("advisor", { note, severity, advisor: source });
@@ -7571,6 +7625,7 @@ export class AgentSession {
 		options?: Pick<PromptOptions, "toolChoice" | "images" | "skipCompactionCheck"> & {
 			prependMessages?: AgentMessage[];
 			skipPostPromptRecoveryWait?: boolean;
+			acceptTerminalEmptyStop?: boolean;
 		},
 	): Promise<void> {
 		this.#beginInFlight();
@@ -7588,6 +7643,7 @@ export class AgentSession {
 			this.#midRunNudgeCount = 0;
 			this.#emptyStopRetryCount = 0;
 			this.#unexpectedStopRetryCount = 0;
+			this.#acceptTerminalEmptyStopForPrompt = options?.acceptTerminalEmptyStop === true;
 			// A new prompt cycle starts: drop any sticky yield-termination from the
 			// previous run so empty-stop / unexpected-stop / compaction maintenance
 			// can evaluate this turn normally.
@@ -8092,12 +8148,25 @@ export class AgentSession {
 		}
 	}
 
-	async #promptAgentInitiatedMessage(message: CustomMessage): Promise<void> {
+	async #promptAgentInitiatedMessage(
+		message: CustomMessage,
+		options?: { acceptTerminalEmptyStop?: boolean },
+	): Promise<void> {
 		this.#beginInFlight();
+		const acceptTerminalEmptyStop = options?.acceptTerminalEmptyStop === true;
 		try {
+			if (acceptTerminalEmptyStop) {
+				this.#emptyStopRetryCount = 0;
+				this.#unexpectedStopRetryCount = 0;
+				this.#yieldTerminationPending = false;
+				this.#acceptTerminalEmptyStopForPrompt = true;
+			} else {
+				this.#acceptTerminalEmptyStopForPrompt = false;
+			}
 			await this.agent.prompt(message);
 			await this.#waitForPostPromptRecovery();
 		} finally {
+			this.#acceptTerminalEmptyStopForPrompt = false;
 			this.#endInFlight();
 		}
 	}
@@ -8152,7 +8221,12 @@ export class AgentSession {
 	 */
 	async sendCustomMessage<T = unknown>(
 		message: Pick<CustomMessage<T>, "customType" | "content" | "display" | "details" | "attribution">,
-		options?: { triggerTurn?: boolean; deliverAs?: "steer" | "followUp" | "nextTurn"; queueChipText?: string },
+		options?: {
+			triggerTurn?: boolean;
+			deliverAs?: "steer" | "followUp" | "nextTurn";
+			queueChipText?: string;
+			acceptTerminalEmptyStop?: boolean;
+		},
 	): Promise<boolean> {
 		const details =
 			options?.queueChipText && options.deliverAs !== "nextTurn"
@@ -8195,7 +8269,9 @@ export class AgentSession {
 					this.#queueHiddenNextTurnMessage(normalizedAppMessage, false);
 					return false;
 				}
-				await this.#promptAgentInitiatedMessage(normalizedAppMessage);
+				await this.#promptAgentInitiatedMessage(normalizedAppMessage, {
+					acceptTerminalEmptyStop: options.acceptTerminalEmptyStop === true,
+				});
 				return true;
 			}
 			this.agent.appendMessage(normalizedAppMessage);
@@ -8214,7 +8290,9 @@ export class AgentSession {
 				this.#queueHiddenNextTurnMessage(normalizedAppMessage, false);
 				return false;
 			}
-			await this.#promptAgentInitiatedMessage(normalizedAppMessage);
+			await this.#promptAgentInitiatedMessage(normalizedAppMessage, {
+				acceptTerminalEmptyStop: options.acceptTerminalEmptyStop === true,
+			});
 			return true;
 		}
 
@@ -10482,6 +10560,12 @@ export class AgentSession {
 			return false;
 		}
 
+		if (this.#acceptTerminalEmptyStopForPrompt && assistantMessage.stopReason === "stop") {
+			this.#acceptTerminalEmptyStopForPrompt = false;
+			this.#emptyStopRetryCount = 0;
+			return false;
+		}
+
 		this.#emptyStopRetryCount++;
 		if (this.#emptyStopRetryCount > EMPTY_STOP_MAX_RETRIES) {
 			const attempts = this.#emptyStopRetryCount - 1;

package/src/task/render.ts

@@ -7,7 +7,7 @@
 import path from "node:path";
 import type { Component } from "jeopi-tui";
 import { Container, Markdown, Text } from "jeopi-tui";
-import { formatNumber } from "jeopi-utils";
+import { formatNumber, sanitizeText } from "jeopi-utils";
 import { settings } from "../config/settings";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import { formatContextUsage } from "../modes/components/status-line/context-thresholds";
@@ -249,11 +249,11 @@ function getRenderYieldLabels(type: RenderYieldItem["type"]): string[] {
 function formatYieldPreview(item: RenderYieldItem): string {
 	if (item.useLastTurn === true && item.data === undefined) return "last assistant turn";
 	if (item.data === undefined) return "last assistant turn";
-	if (typeof item.data === "string") return previewLine(replaceTabs(item.data), 70);
+	if (typeof item.data === "string") return previewLine(replaceTabs(sanitizeText(item.data)), 70);
 	try {
-		return previewLine(replaceTabs(JSON.stringify(item.data) ?? "null"), 70);
+		return previewLine(replaceTabs(sanitizeText(JSON.stringify(item.data) ?? "null")), 70);
 	} catch {
-		return previewLine(replaceTabs(String(item.data)), 70);
+		return previewLine(replaceTabs(sanitizeText(String(item.data))), 70);
 	}
 }
 
@@ -281,7 +281,7 @@ function renderTypedYieldSections(value: unknown, continuePrefix: string, expand
 function formatJsonScalar(value: unknown, _theme: Theme): string {
 	if (value === null) return "null";
 	if (typeof value === "string") {
-		const trimmed = truncateToWidth(value, 70);
+		const trimmed = truncateToWidth(sanitizeText(value), 70);
 		return `"${trimmed}"`;
 	}
 	if (typeof value === "number" || typeof value === "boolean") return String(value);
@@ -291,8 +291,9 @@ function formatJsonScalar(value: unknown, _theme: Theme): string {
 export function formatTaskId(id: string): string {
 	// Ids are name-based (e.g. "Anna", "Anna-2"); a "." separates nesting levels
 	// (e.g. "Anna.Bob"). Render the hierarchy with a ">" breadcrumb.
-	const segments = id.split(".");
-	return segments.length < 2 ? id : segments.join(">");
+	const sanitizedId = sanitizeText(id);
+	const segments = sanitizedId.split(".");
+	return segments.length < 2 ? sanitizedId : segments.join(">");
 }
 
 const MISSING_YIELD_WARNING_PREFIX = "SYSTEM WARNING: Subagent exited without calling yield tool";
@@ -347,13 +348,13 @@ function renderJsonTreeLines(
 		const scalar = formatJsonScalar(val, theme);
 
 		if (scalar) {
-			const label = key ? theme.fg("muted", key) : theme.fg("muted", "value");
+			const label = key ? theme.fg("muted", sanitizeText(key)) : theme.fg("muted", "value");
 			pushLine(`${prefix}${iconScalar} ${label}: ${theme.fg("dim", scalar)}`);
 			return;
 		}
 
 		if (Array.isArray(val)) {
-			const header = key ? theme.fg("muted", key) : theme.fg("muted", "array");
+			const header = key ? theme.fg("muted", sanitizeText(key)) : theme.fg("muted", "array");
 			pushLine(`${prefix}${iconArray} ${header}`);
 			if (val.length === 0) {
 				pushLine(
@@ -385,7 +386,7 @@ function renderJsonTreeLines(
 		}
 
 		if (val && typeof val === "object") {
-			const header = key ? theme.fg("muted", key) : theme.fg("muted", "object");
+			const header = key ? theme.fg("muted", sanitizeText(key)) : theme.fg("muted", "object");
 			pushLine(`${prefix}${iconObject} ${header}`);
 			const entries = Object.entries(val as Record<string, unknown>);
 			if (entries.length === 0) {
@@ -418,8 +419,8 @@ function renderJsonTreeLines(
 			return;
 		}
 
-		const label = key ? theme.fg("muted", key) : theme.fg("muted", "value");
-		pushLine(`${prefix}${iconScalar} ${label}: ${theme.fg("dim", String(val))}`);
+		const label = key ? theme.fg("muted", sanitizeText(key)) : theme.fg("muted", "value");
+		pushLine(`${prefix}${iconScalar} ${label}: ${theme.fg("dim", sanitizeText(String(val)))}`);
 	};
 
 	const renderRoot = (val: unknown) => {
@@ -466,7 +467,7 @@ function stripRecentOutputNoticeLine(text: string): string {
 }
 
 function sanitizeRecentOutput(output: string): string {
-	let text = output.trimEnd();
+	let text = sanitizeText(output).trimEnd();
 	while (text) {
 		const withoutArtifactNotice = stripRawOutputArtifactNotice(text).text;
 		if (withoutArtifactNotice !== text) {
@@ -498,7 +499,8 @@ function renderOutputSection(
 	warning?: string,
 ): string[] {
 	const lines: string[] = [];
-	const trimmedOutput = output.trimEnd();
+	const sanitizedOutput = sanitizeText(output);
+	const trimmedOutput = sanitizedOutput.trimEnd();
 	if (!trimmedOutput && !warning) return lines;
 
 	if (warning) {
@@ -506,7 +508,7 @@ function renderOutputSection(
 		lines.push(
 			`${continuePrefix}  ${theme.fg("warning", theme.status.warning)} ${theme.fg(
 				"dim",
-				truncateToWidth(warning, 80),
+				truncateToWidth(sanitizeText(warning), 80),
 			)}`,
 		);
 
@@ -537,8 +539,7 @@ function renderOutputSection(
 				// Fall back to raw output
 			}
 		}
-
-		const outputLines = output.trimEnd().split("\n");
+		const outputLines = trimmedOutput.split("\n");
 		const previewCount = expanded ? maxExpanded : maxCollapsed;
 		for (const line of outputLines.slice(0, previewCount)) {
 			lines.push(`${continuePrefix}  ${theme.fg("dim", truncateToWidth(replaceTabs(line), 70))}`);
@@ -581,8 +582,7 @@ function renderOutputSection(
 	}
 
 	lines.push(`${continuePrefix}${theme.fg("dim", "Output")}`);
-
-	const outputLines = output.trimEnd().split("\n");
+	const outputLines = trimmedOutput.split("\n");
 	const previewCount = expanded ? maxExpanded : maxCollapsed;
 	for (const line of outputLines.slice(0, previewCount)) {
 		lines.push(`${continuePrefix}  ${theme.fg("dim", truncateToWidth(replaceTabs(line), 70))}`);
@@ -603,7 +603,7 @@ function renderTaskSection(
 	maxExpanded = 20,
 ): string[] {
 	const lines: string[] = [];
-	const trimmed = task.trim();
+	const trimmed = sanitizeText(task).trim();
 	if (!expanded || !trimmed) return lines;
 
 	lines.push(`${continuePrefix}${theme.fg("dim", "Task")}`);
@@ -624,10 +624,11 @@ function formatScalarInline(value: unknown, maxLen: number, _theme: Theme): stri
 	if (typeof value === "boolean") return String(value);
 	if (typeof value === "number") return String(value);
 	if (typeof value === "string") {
-		const firstLine = value.split("\n")[0].trim();
-		if (firstLine.length === 0) return `"" (${value.split("\n").length} lines)`;
+		const sanitizedValue = sanitizeText(value);
+		const firstLine = sanitizedValue.split("\n")[0].trim();
+		if (firstLine.length === 0) return `"" (${sanitizedValue.split("\n").length} lines)`;
 		const preview = truncateToWidth(firstLine, maxLen);
-		if (value.includes("\n")) return `"${preview}…" (${value.split("\n").length} lines)`;
+		if (sanitizedValue.includes("\n")) return `"${preview}…" (${sanitizedValue.split("\n").length} lines)`;
 		return `"${preview}"`;
 	}
 	if (Array.isArray(value)) return `[${value.length} items]`;
@@ -635,7 +636,7 @@ function formatScalarInline(value: unknown, maxLen: number, _theme: Theme): stri
 		const keys = Object.keys(value);
 		return `{${keys.length} keys}`;
 	}
-	return String(value);
+	return sanitizeText(String(value));
 }
 
 function formatOutputInline(data: unknown, theme: Theme, maxWidth = 80): string {
@@ -662,7 +663,7 @@ function formatOutputInline(data: unknown, theme: Theme, maxWidth = 80): string
 
 	for (const [key, value] of entries) {
 		const valueStr = formatScalarInline(value, 24, theme);
-		const pairStr = `${key}=${valueStr}`;
+		const pairStr = `${sanitizeText(key)}=${valueStr}`;
 		const addLen = pairs.length > 0 ? pairStr.length + 2 : pairStr.length; // +2 for ", "
 
 		if (totalLen + addLen > maxWidth && pairs.length > 0) {
@@ -760,7 +761,9 @@ function createAssignmentSectionRenderer(
 	// `renderResult` receives the raw tool args (unlike `renderCall`, which is
 	// fed through `repairTaskParams`), so undo any per-field double-encoding
 	// here too. The repair is idempotent on already-clean text.
-	const assignment = repairDoubleEncodedJsonString(typeof args?.assignment === "string" ? args.assignment : "").trim();
+	const assignment = sanitizeText(
+		repairDoubleEncodedJsonString(typeof args?.assignment === "string" ? args.assignment : ""),
+	).trim();
 	if (!assignment) return undefined;
 	return createMarkdownSectionRenderer(assignment, theme);
 }
@@ -774,7 +777,9 @@ function createContextSectionRenderer(
 	args: Partial<TaskParams> | undefined,
 	theme: Theme,
 ): AssignmentSectionRenderer | undefined {
-	const context = repairDoubleEncodedJsonString(typeof args?.context === "string" ? args.context : "").trim();
+	const context = sanitizeText(
+		repairDoubleEncodedJsonString(typeof args?.context === "string" ? args.context : ""),
+	).trim();
 	if (!context) return undefined;
 	return createMarkdownSectionRenderer(context, theme);
 }
@@ -858,7 +863,7 @@ function renderAgentProgress(
 				: "accent";
 
 	// Main status line: id: description [status] · stats · ⟨agent⟩
-	const trimmedDescription = progress.description?.trim();
+	const trimmedDescription = progress.description ? sanitizeText(progress.description).trim() : undefined;
 	const description = trimmedDescription ? previewLine(trimmedDescription, 64) : undefined;
 	const displayId = formatTaskId(progress.id);
 	const titlePart = description ? `${theme.bold(displayId)}: ${description}` : displayId;
@@ -900,7 +905,7 @@ function renderAgentProgress(
 	const showBadge = settings.get("task.showResolvedModelBadge");
 	if (progress.status === "running") {
 		if (!description) {
-			const taskPreview = previewLine(progress.assignment ?? progress.task, 40);
+			const taskPreview = previewLine(sanitizeText(progress.assignment ?? progress.task), 40);
 			statusLine += ` ${theme.fg("muted", taskPreview)}`;
 		}
 		statusLine = appendAgentStats(statusLine, { ...progress, showResolvedModelBadge: showBadge }, theme);
@@ -915,10 +920,10 @@ function renderAgentProgress(
 	// Current tool (if running) or most recent completed tool
 	if (progress.status === "running") {
 		if (progress.currentTool) {
-			let toolLine = `${continuePrefix}${theme.tree.hook} ${theme.fg("muted", progress.currentTool)}`;
+			let toolLine = `${continuePrefix}${theme.tree.hook} ${theme.fg("muted", sanitizeText(progress.currentTool))}`;
 			const toolDetail = progress.lastIntent ?? progress.currentToolArgs;
 			if (toolDetail) {
-				toolLine += `: ${theme.fg("dim", previewLine(toolDetail, 40))}`;
+				toolLine += `: ${theme.fg("dim", previewLine(sanitizeText(toolDetail), 40))}`;
 			}
 			if (progress.currentToolStartMs) {
 				const elapsed = Date.now() - progress.currentToolStartMs;
@@ -930,10 +935,10 @@ function renderAgentProgress(
 		} else if (progress.recentTools.length > 0) {
 			// Show most recent completed tool when idle between tools
 			const recent = progress.recentTools[0];
-			let toolLine = `${continuePrefix}${theme.tree.hook} ${theme.fg("dim", recent.tool)}`;
+			let toolLine = `${continuePrefix}${theme.tree.hook} ${theme.fg("dim", sanitizeText(recent.tool))}`;
 			const toolDetail = progress.lastIntent ?? recent.args;
 			if (toolDetail) {
-				toolLine += `: ${theme.fg("dim", previewLine(toolDetail, 40))}`;
+				toolLine += `: ${theme.fg("dim", previewLine(sanitizeText(toolDetail), 40))}`;
 			}
 			lines.push(toolLine);
 		}
@@ -947,12 +952,12 @@ function renderAgentProgress(
 		const waitLabel = remainingMs > 0 ? `in ${formatDuration(remainingMs)}` : "now";
 		const summary =
 			`retrying ${progress.retryState.attempt}/${progress.retryState.maxAttempts} ${waitLabel}: ` +
-			previewLine(progress.retryState.errorMessage, 60);
+			previewLine(sanitizeText(progress.retryState.errorMessage), 60);
 		lines.push(`${continuePrefix}${theme.tree.hook} ${theme.fg("warning", summary)}`);
 	} else if (progress.retryFailure && progress.status !== "running") {
 		const summary = `auto-retry gave up after ${progress.retryFailure.attempt} attempt${
 			progress.retryFailure.attempt === 1 ? "" : "s"
-		}: ${previewLine(progress.retryFailure.errorMessage, 80)}`;
+		}: ${previewLine(sanitizeText(progress.retryFailure.errorMessage), 80)}`;
 		lines.push(`${continuePrefix}${theme.tree.hook} ${theme.fg("error", summary)}`);
 	}
 
@@ -1098,13 +1103,13 @@ function renderReviewResult(
 	if (summary.explanation) {
 		if (expanded) {
 			lines.push(`${continuePrefix}${theme.fg("dim", "Summary")}`);
-			const explanationLines = summary.explanation.split("\n");
+			const explanationLines = sanitizeText(summary.explanation).split("\n");
 			for (const line of explanationLines) {
 				lines.push(`${continuePrefix}  ${theme.fg("dim", replaceTabs(line))}`);
 			}
 		} else {
 			// Preview: first sentence or ~100 chars (flatten tabs/newlines first)
-			const flat = replaceTabs(summary.explanation).replace(/[\r\n]+/g, " ");
+			const flat = replaceTabs(sanitizeText(summary.explanation)).replace(/[\r\n]+/g, " ");
 			const firstSentence = flat.split(/[.!?]/)[0].trim();
 			const preview = truncateToWidth(`${firstSentence}.`, 100);
 			lines.push(`${continuePrefix}${theme.fg("dim", preview)}`);
@@ -1145,9 +1150,9 @@ function renderFindings(
 		const findingContinue = isLastFinding ? "   " : `${theme.tree.vertical}  `;
 
 		const { color } = getPriorityInfo(finding.priority);
-		const rawTitle = finding.title?.replace(/^\[P\d\]\s*/, "") ?? "Untitled";
+		const rawTitle = sanitizeText(finding.title?.replace(/^\[P\d\]\s*/, "") ?? "Untitled");
 		const titleText = replaceTabs(rawTitle).replace(/[\r\n]+/g, " ");
-		const loc = `${path.basename(finding.file_path || "<unknown>")}:${finding.line_start}`;
+		const loc = `${path.basename(sanitizeText(finding.file_path || "<unknown>"))}:${finding.line_start}`;
 
 		lines.push(
 			`${continuePrefix}${findingPrefix} ${theme.fg(color, `[${finding.priority}]`)} ${titleText} ${theme.fg("dim", loc)}`,
@@ -1156,7 +1161,7 @@ function renderFindings(
 		// Show body when expanded
 		if (expanded && finding.body) {
 			// Wrap body text
-			const bodyLines = finding.body.split("\n");
+			const bodyLines = sanitizeText(finding.body).split("\n");
 			for (const bodyLine of bodyLines) {
 				lines.push(`${continuePrefix}${findingContinue}${theme.fg("dim", replaceTabs(bodyLine))}`);
 			}
@@ -1208,7 +1213,7 @@ function renderAgentResult(
 					: "failed";
 
 	// Main status line: id: description [status] · stats · ⟨agent⟩
-	const trimmedDescription = result.description?.trim();
+	const trimmedDescription = result.description ? sanitizeText(result.description).trim() : undefined;
 	const description = trimmedDescription ? previewLine(trimmedDescription, 64) : undefined;
 	const displayId = formatTaskId(result.id);
 	const titlePart = description ? `${theme.bold(displayId)}: ${description}` : displayId;
@@ -1242,7 +1247,7 @@ function renderAgentResult(
 
 	if (aborted && result.abortReason) {
 		lines.push(
-			`${continuePrefix}${theme.fg("error", theme.status.aborted)} ${theme.fg("dim", previewLine(result.abortReason, 80))}`,
+			`${continuePrefix}${theme.fg("error", theme.status.aborted)} ${theme.fg("dim", previewLine(sanitizeText(result.abortReason), 80))}`,
 		);
 	}
 	// Check for review result, preferring incremental yield sections and falling
@@ -1346,7 +1351,7 @@ function renderAgentResult(
 		lines.push(
 			`${continuePrefix}${theme.fg("warning", theme.status.warning)} ${theme.fg(
 				"dim",
-				truncateToWidth(missingCompleteWarning, 80),
+				truncateToWidth(sanitizeText(missingCompleteWarning), 80),
 			)}`,
 		);
 	}
@@ -1370,7 +1375,9 @@ function renderAgentResult(
 
 	// Error message
 	if (result.error && (!success || mergeFailed) && (!aborted || result.error !== result.abortReason)) {
-		lines.push(`${continuePrefix}${theme.fg(mergeFailed ? "warning" : "error", previewLine(result.error, 70))}`);
+		lines.push(
+			`${continuePrefix}${theme.fg(mergeFailed ? "warning" : "error", previewLine(sanitizeText(result.error), 70))}`,
+		);
 	}
 
 	return lines;

package/src/tools/bash.ts

@@ -23,7 +23,6 @@ import { CachedOutputBlock, markFramedBlockComponent, outputBlockContentWidth }
 import { getSixelLineMask } from "../utils/sixel";
 import type { ToolSession } from ".";
 import { truncateForPrompt } from "./approval";
-import { applyBashFixups } from "./bash-command-fixup";
 import { type BashInteractiveResult, runInteractiveBashPty } from "./bash-interactive";
 import { checkBashInterception } from "./bash-interceptor";
 import { canUseInteractiveBashPty } from "./bash-pty-selection";
@@ -660,16 +659,6 @@ export class BashTool implements AgentTool<typeof bashSchemaBase | typeof bashSc
 		let command = rawCommand;
 		const env = normalizeBashEnv(rawEnv);
 
-		// Apply conservative bash fixups (strip trailing `| head|tail` and redundant
-		// `2>&1`). The helper is single-line only and refuses anything that could
-		// change semantics.
-		if (this.session.settings.get("bash.stripTrailingHeadTail")) {
-			const fixup = applyBashFixups(command);
-			if (fixup.stripped.length > 0) {
-				command = fixup.command;
-			}
-		}
-
 		// Extract leading `cd <path> && ...` into cwd when the model ignores the cwd parameter.
 		// Constrained to a single line so a `&&` that sits on a later line of a multiline
 		// script can't pull the entire script into the "cwd" capture.

package/src/tools/path-utils.ts

@@ -147,8 +147,13 @@ export function expandTilde(filePath: string, home?: string): string {
 }
 
 export function expandPath(filePath: string): string {
+	// Some models intermittently prefix an otherwise-valid path with a stray
+	// `:` (e.g. `:/abs/path`, `:../rel`). No real path starts with `:` and it
+	// never begins a selector against an absolute/relative path, so strip it
+	// before resolution — mirroring the `@`-prefix normalization above.
+	const deColoned = /^:(?=[/~]|\.\.?\/)/.test(filePath) ? filePath.slice(1) : filePath;
 	const normalized = stripWindowsExtendedLengthPathPrefix(
-		stripFileUrl(normalizeUnicodeSpaces(normalizeAtPrefix(filePath))),
+		stripFileUrl(normalizeUnicodeSpaces(normalizeAtPrefix(deColoned))),
 	);
 	return expandTilde(normalized);
 }

package/src/utils/title-generator.ts

@@ -52,6 +52,8 @@ const THINKING_TAG_ENVELOPE_RE = /<(think|thinking|reasoning)>\s*[\s\S]*?<\/\1>/
 const THINKING_FENCE_ENVELOPE_RE = /```(?:thinking|reasoning)\b[\s\S]*?```/gi;
 const LEADING_THINKING_TAG_RE = /^\s*<(think|thinking|reasoning)>\s*[\s\S]*?<\/\1>\s*/i;
 const LEADING_THINKING_FENCE_RE = /^\s*```(?:thinking|reasoning)\b[\s\S]*?```\s*/i;
+const LEADING_PROSE_THINKING_PREAMBLE_RE =
+	/^[ \t]*(?:(?:here(?:['’]s| is)[ \t]+(?:a|the|my)[ \t]+)|my[ \t]+)?(?:thinking|thought|reasoning)[ \t]+process[ \t]*:?[ \t]*(?:\r?\n|$)/i;
 
 /**
  * Whether the model honors a forced `tool_choice` so the `set_title` tool can be
@@ -300,9 +302,11 @@ function extractGeneratedTitle(contentBlocks: AssistantMessage["content"]): stri
 	// leaked thinking envelopes plus any stray/unclosed title tag fragment.
 	const markedTitle = extractVisibleMarkedTitle(textTitle);
 	if (markedTitle !== undefined) return markedTitle;
-	return stripLeadingLeakedThinkingMarkup(textTitle)
+	const cleanedTextTitle = stripLeadingLeakedThinkingMarkup(textTitle)
 		.replace(/<\/?title>/gi, "")
 		.trim();
+	if (LEADING_PROSE_THINKING_PREAMBLE_RE.test(cleanedTextTitle)) return "";
+	return cleanedTextTitle;
 }
 
 function extractVisibleMarkedTitle(text: string): string | undefined {

package/dist/types/tools/bash-command-fixup.d.ts

@@ -1,11 +0,0 @@
-export interface BashFixupResult {
-    /** Possibly-rewritten command. */
-    command: string;
-    /** Substrings that were stripped, in the order they were removed. */
-    stripped: string[];
-}
-/**
- * Apply both fixups to a bash command. On any parse failure, multi-line input,
- * or no-op transform, returns the input verbatim with `stripped: []`.
- */
-export declare function applyBashFixups(command: string): BashFixupResult;

package/src/tools/bash-command-fixup.ts

@@ -1,37 +0,0 @@
-/**
- * Conservative transforms applied to a bash command before execution.
- *
- * Two fixups are applied, each anchored to the end of a top-level segment
- * (segments split on `;`, `&&`, `||`, and background `&`):
- *
- *  1. Trailing `| head [args]` / `| tail [args]` (and the `|&` variant) — these
- *     pipes exist purely to limit output length. The harness already truncates
- *     bash output and exposes the full result via an artifact, so they only
- *     hide content the agent wanted.
- *
- *  2. A redundant trailing `2>&1` left on a segment that has no remaining pipe
- *     or other redirect. The harness already merges stderr into stdout, so the
- *     duplication is purely cosmetic — and often a leftover after fixup (1)
- *     drops a downstream pipe.
- *
- * The heavy lifting (tokenization, quoting, heredoc handling, command
- * substitution, nested compound commands) lives in Rust under
- * `pi_shell::fixup`, driven by the real `brush-parser` AST. This module is a
- * thin sync wrapper plus user-facing notice formatting.
- */
-import { applyBashFixups as nativeApplyBashFixups } from "jeopi-natives";
-
-export interface BashFixupResult {
-	/** Possibly-rewritten command. */
-	command: string;
-	/** Substrings that were stripped, in the order they were removed. */
-	stripped: string[];
-}
-
-/**
- * Apply both fixups to a bash command. On any parse failure, multi-line input,
- * or no-op transform, returns the input verbatim with `stripped: []`.
- */
-export function applyBashFixups(command: string): BashFixupResult {
-	return nativeApplyBashFixups(command);
-}