e4c3cba143
Ports only the thinking double-format fix: resolveThinkingDisplay reuses block.thinking when rawThinking is set (buildDisplayMessage already formatted it), plus a single-entry memo in formatThinkingForDisplay and a rawThinking regression test. The PR's incremental reveal slicing is superseded by the already-merged #3848 (memoized grapheme slicing).
118 lines
3.6 KiB
TypeScript
118 lines
3.6 KiB
TypeScript
import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
|
|
|
|
// Single-entry memo for the proseOnly formatting path. During a streaming tick
|
|
// the same growing thinking text is formatted up to three times (reveal count,
|
|
// reveal slice, component render); this collapses them to one computation. The
|
|
// `proseOnly === false` branch is a passthrough and never consults the cache, so
|
|
// the key can be the text alone. A single entry is enough for the common case of
|
|
// one active thinking block and never regresses (a miss recomputes exactly as
|
|
// before).
|
|
let formatCacheKey = "";
|
|
let formatCacheValue = "";
|
|
|
|
export function canonicalizeMessage(text: string | null | undefined): string {
|
|
if (!text) return "";
|
|
const trimmed = text.trim();
|
|
for (let i = 0; i < trimmed.length; i++) {
|
|
const code = trimmed.charCodeAt(i);
|
|
if (code !== 0x2e && code !== 0x2026 && code !== 0x20 && code !== 0x09 && code !== 0x0a && code !== 0x0d) {
|
|
return trimmed;
|
|
}
|
|
}
|
|
return "";
|
|
}
|
|
|
|
export function formatThinkingForDisplay(text: string, proseOnly: boolean): string {
|
|
if (!proseOnly || !text) return text;
|
|
if (text === formatCacheKey) return formatCacheValue;
|
|
|
|
const lines = text.split("\n");
|
|
const resultLines: string[] = [];
|
|
let inFence = false;
|
|
let fenceChar = "";
|
|
let fenceLen = 0;
|
|
|
|
const FENCE = /^( {0,3})([`~]{3,})/;
|
|
const appendEllipsis = () => {
|
|
let lastLineIdx = resultLines.length - 1;
|
|
while (lastLineIdx >= 0 && resultLines[lastLineIdx]!.trim() === "") {
|
|
lastLineIdx--;
|
|
}
|
|
|
|
if (lastLineIdx >= 0) {
|
|
const lastLine = resultLines[lastLineIdx]!;
|
|
const trimmed = lastLine.trimEnd();
|
|
if (trimmed.endsWith("...")) {
|
|
resultLines[lastLineIdx] = trimmed;
|
|
} else if (trimmed.endsWith(".")) {
|
|
resultLines[lastLineIdx] = `${trimmed.slice(0, -1)}...`;
|
|
} else {
|
|
resultLines[lastLineIdx] = `${trimmed}...`;
|
|
}
|
|
} else {
|
|
resultLines.push("...");
|
|
}
|
|
};
|
|
|
|
for (let i = 0; i < lines.length; i++) {
|
|
const line = lines[i]!;
|
|
const open = FENCE.exec(line);
|
|
|
|
if (inFence) {
|
|
// A closing fence is the same char, at least as long, with nothing else on the line.
|
|
if (
|
|
open &&
|
|
open[2]![0] === fenceChar &&
|
|
open[2]!.length >= fenceLen &&
|
|
line.slice(open[1]!.length + open[2]!.length).trim() === ""
|
|
) {
|
|
inFence = false;
|
|
fenceChar = "";
|
|
fenceLen = 0;
|
|
}
|
|
// We skip all internal lines of a code fence.
|
|
} else if (open) {
|
|
const marker = open[2]!;
|
|
const ch = marker[0]!;
|
|
// A backtick fence's info string may not contain a backtick.
|
|
if (!(ch === "`" && line.slice(open[1]!.length + marker.length).includes("`"))) {
|
|
inFence = true;
|
|
fenceChar = ch;
|
|
fenceLen = marker.length;
|
|
appendEllipsis();
|
|
} else {
|
|
resultLines.push(line);
|
|
}
|
|
} else {
|
|
resultLines.push(line);
|
|
}
|
|
}
|
|
|
|
const formatted = resultLines.join("\n");
|
|
formatCacheKey = text;
|
|
formatCacheValue = formatted;
|
|
return formatted;
|
|
}
|
|
|
|
/** Whether a formatted thinking block has non-placeholder content worth rendering. */
|
|
export function hasDisplayableThinking(
|
|
text: string | null | undefined,
|
|
formattedText: string | null | undefined,
|
|
): boolean {
|
|
if (!text) return false;
|
|
if (!formattedText) return false;
|
|
return formattedText.length > 0 && canonicalizeMessage(text).length > 0;
|
|
}
|
|
|
|
/** Whether an assistant message contains thinking content the TUI can reveal. */
|
|
export function messageHasDisplayableThinking(message: AgentMessage, proseOnly: boolean): boolean {
|
|
if (message.role !== "assistant") return false;
|
|
for (const content of message.content) {
|
|
if (content.type !== "thinking") continue;
|
|
if (hasDisplayableThinking(content.thinking, formatThinkingForDisplay(content.thinking, proseOnly))) {
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|