github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-09 21:54:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix (tui): harden render sanitization for narrow terminals

Browse Source
This commit is contained in:
Vignesh Natarajan
2026-02-14 18:44:44 -08:00
parent f9bb748a6c
commit de02b07209
1 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/tui/tui-formatters.ts
View File

@@ -3,11 +3,27 @@ import { stripAnsi } from "../terminal/ansi.js";
import { formatTokenCount } from "../utils/usage-format.js"; import { formatTokenCount } from "../utils/usage-format.js";
const REPLACEMENT_CHAR_RE = /\uFFFD/g; const REPLACEMENT_CHAR_RE = /\uFFFD/g;
const LONG_TOKEN_RE = /\S{97,}/g; const MAX_TOKEN_CHARS = 32;
const MAX_TOKEN_CHARS = 64; const LONG_TOKEN_RE = /\S{33,}/g;
const LONG_TOKEN_TEST_RE = /\S{33,}/;
const BINARY_LINE_REPLACEMENT_THRESHOLD = 12; const BINARY_LINE_REPLACEMENT_THRESHOLD = 12;
function hasControlChars(text: string): boolean {
for (const char of text) {
const code = char.charCodeAt(0);
const isAsciiControl = code <= 0x1f && code !== 0x09 && code !== 0x0a && code !== 0x0d;
const isC1Control = code >= 0x7f && code <= 0x9f;
if (isAsciiControl || isC1Control) {
return true;
}
}
return false;
}
function stripControlChars(text: string): string { function stripControlChars(text: string): string {
if (!hasControlChars(text)) {
return text;
}
let sanitized = ""; let sanitized = "";
for (const char of text) { for (const char of text) {
const code = char.charCodeAt(0); const code = char.charCodeAt(0);
@@ -46,13 +62,26 @@ export function sanitizeRenderableText(text: string): string {
if (!text) { if (!text) {
return text; return text;
} }
const withoutAnsi = stripAnsi(text);
const withoutControlChars = stripControlChars(withoutAnsi); const hasAnsi = text.includes("\u001b");
const redacted = withoutControlChars const hasReplacementChars = text.includes("\uFFFD");
.split("\n") const hasLongTokens = LONG_TOKEN_TEST_RE.test(text);
.map((line) => redactBinaryLikeLine(line)) const hasControls = hasControlChars(text);
.join("\n"); if (!hasAnsi && !hasReplacementChars && !hasLongTokens && !hasControls) {
return redacted.replace(LONG_TOKEN_RE, (token) => chunkToken(token, MAX_TOKEN_CHARS).join(" ")); return text;
}
const withoutAnsi = hasAnsi ? stripAnsi(text) : text;
const withoutControlChars = hasControls ? stripControlChars(withoutAnsi) : withoutAnsi;
const redacted = hasReplacementChars
? withoutControlChars
.split("\n")
.map((line) => redactBinaryLikeLine(line))
.join("\n")
: withoutControlChars;
return LONG_TOKEN_TEST_RE.test(redacted)
? redacted.replace(LONG_TOKEN_RE, (token) => chunkToken(token, MAX_TOKEN_CHARS).join(" "))
: redacted;
} }
export function resolveFinalAssistantText(params: { export function resolveFinalAssistantText(params: {