mirror of
https://github.com/google-gemini/gemini-cli.git
synced 2026-04-01 08:51:11 -07:00
feat(escape ansi): escape ansi ctrl codes from model output before displaying to user (#8636)
This commit is contained in:
170
packages/cli/src/ui/utils/textUtils.test.ts
Normal file
170
packages/cli/src/ui/utils/textUtils.test.ts
Normal file
@@ -0,0 +1,170 @@
|
||||
/**
|
||||
* @license
|
||||
* Copyright 2025 Google LLC
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
import { describe, it, expect } from 'vitest';
|
||||
import type {
|
||||
ToolCallConfirmationDetails,
|
||||
ToolEditConfirmationDetails,
|
||||
} from '@google/gemini-cli-core';
|
||||
import { escapeAnsiCtrlCodes } from './textUtils.js';
|
||||
|
||||
describe('textUtils', () => {
|
||||
describe('escapeAnsiCtrlCodes', () => {
|
||||
describe('escapeAnsiCtrlCodes string case study', () => {
|
||||
it('should replace ANSI escape codes with a visible representation', () => {
|
||||
const text = '\u001b[31mHello\u001b[0m';
|
||||
const expected = '\\u001b[31mHello\\u001b[0m';
|
||||
expect(escapeAnsiCtrlCodes(text)).toBe(expected);
|
||||
|
||||
const text2 = "sh -e 'good && bad# \u001b[9D\u001b[K && good";
|
||||
const expected2 = "sh -e 'good && bad# \\u001b[9D\\u001b[K && good";
|
||||
expect(escapeAnsiCtrlCodes(text2)).toBe(expected2);
|
||||
});
|
||||
|
||||
it('should not change a string with no ANSI codes', () => {
|
||||
const text = 'Hello, world!';
|
||||
expect(escapeAnsiCtrlCodes(text)).toBe(text);
|
||||
});
|
||||
|
||||
it('should handle an empty string', () => {
|
||||
expect(escapeAnsiCtrlCodes('')).toBe('');
|
||||
});
|
||||
|
||||
describe('toolConfirmationDetails case study', () => {
|
||||
it('should sanitize command and rootCommand for exec type', () => {
|
||||
const details: ToolCallConfirmationDetails = {
|
||||
title: '\u001b[34mfake-title\u001b[0m',
|
||||
type: 'exec',
|
||||
command: '\u001b[31mmls -l\u001b[0m',
|
||||
rootCommand: '\u001b[32msudo apt-get update\u001b[0m',
|
||||
onConfirm: async () => {},
|
||||
};
|
||||
|
||||
const sanitized = escapeAnsiCtrlCodes(details);
|
||||
|
||||
if (sanitized.type === 'exec') {
|
||||
expect(sanitized.title).toBe('\\u001b[34mfake-title\\u001b[0m');
|
||||
expect(sanitized.command).toBe('\\u001b[31mmls -l\\u001b[0m');
|
||||
expect(sanitized.rootCommand).toBe(
|
||||
'\\u001b[32msudo apt-get update\\u001b[0m',
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
it('should sanitize properties for edit type', () => {
|
||||
const details: ToolCallConfirmationDetails = {
|
||||
type: 'edit',
|
||||
title: '\u001b[34mEdit File\u001b[0m',
|
||||
fileName: '\u001b[31mfile.txt\u001b[0m',
|
||||
filePath: '/path/to/\u001b[32mfile.txt\u001b[0m',
|
||||
fileDiff:
|
||||
'diff --git a/file.txt b/file.txt\n--- a/\u001b[33mfile.txt\u001b[0m\n+++ b/file.txt',
|
||||
onConfirm: async () => {},
|
||||
} as unknown as ToolEditConfirmationDetails;
|
||||
|
||||
const sanitized = escapeAnsiCtrlCodes(details);
|
||||
|
||||
if (sanitized.type === 'edit') {
|
||||
expect(sanitized.title).toBe('\\u001b[34mEdit File\\u001b[0m');
|
||||
expect(sanitized.fileName).toBe('\\u001b[31mfile.txt\\u001b[0m');
|
||||
expect(sanitized.filePath).toBe(
|
||||
'/path/to/\\u001b[32mfile.txt\\u001b[0m',
|
||||
);
|
||||
expect(sanitized.fileDiff).toBe(
|
||||
'diff --git a/file.txt b/file.txt\n--- a/\\u001b[33mfile.txt\\u001b[0m\n+++ b/file.txt',
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
it('should sanitize properties for mcp type', () => {
|
||||
const details: ToolCallConfirmationDetails = {
|
||||
type: 'mcp',
|
||||
title: '\u001b[34mCloud Run\u001b[0m',
|
||||
serverName: '\u001b[31mmy-server\u001b[0m',
|
||||
toolName: '\u001b[32mdeploy\u001b[0m',
|
||||
toolDisplayName: '\u001b[33mDeploy Service\u001b[0m',
|
||||
onConfirm: async () => {},
|
||||
};
|
||||
|
||||
const sanitized = escapeAnsiCtrlCodes(details);
|
||||
|
||||
if (sanitized.type === 'mcp') {
|
||||
expect(sanitized.title).toBe('\\u001b[34mCloud Run\\u001b[0m');
|
||||
expect(sanitized.serverName).toBe('\\u001b[31mmy-server\\u001b[0m');
|
||||
expect(sanitized.toolName).toBe('\\u001b[32mdeploy\\u001b[0m');
|
||||
expect(sanitized.toolDisplayName).toBe(
|
||||
'\\u001b[33mDeploy Service\\u001b[0m',
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
it('should sanitize properties for info type', () => {
|
||||
const details: ToolCallConfirmationDetails = {
|
||||
type: 'info',
|
||||
title: '\u001b[34mWeb Search\u001b[0m',
|
||||
prompt: '\u001b[31mSearch for cats\u001b[0m',
|
||||
urls: ['https://\u001b[32mgoogle.com\u001b[0m'],
|
||||
onConfirm: async () => {},
|
||||
};
|
||||
|
||||
const sanitized = escapeAnsiCtrlCodes(details);
|
||||
|
||||
if (sanitized.type === 'info') {
|
||||
expect(sanitized.title).toBe('\\u001b[34mWeb Search\\u001b[0m');
|
||||
expect(sanitized.prompt).toBe(
|
||||
'\\u001b[31mSearch for cats\\u001b[0m',
|
||||
);
|
||||
expect(sanitized.urls?.[0]).toBe(
|
||||
'https://\\u001b[32mgoogle.com\\u001b[0m',
|
||||
);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
it('should not change the object if no sanitization is needed', () => {
|
||||
const details: ToolCallConfirmationDetails = {
|
||||
type: 'info',
|
||||
title: 'Web Search',
|
||||
prompt: 'Search for cats',
|
||||
urls: ['https://google.com'],
|
||||
onConfirm: async () => {},
|
||||
};
|
||||
|
||||
const sanitized = escapeAnsiCtrlCodes(details);
|
||||
expect(sanitized).toBe(details);
|
||||
});
|
||||
|
||||
it('should handle nested objects and arrays', () => {
|
||||
const details = {
|
||||
a: '\u001b[31mred\u001b[0m',
|
||||
b: {
|
||||
c: '\u001b[32mgreen\u001b[0m',
|
||||
d: ['\u001b[33myellow\u001b[0m', { e: '\u001b[34mblue\u001b[0m' }],
|
||||
},
|
||||
f: 123,
|
||||
g: null,
|
||||
h: () => '\u001b[35mpurple\u001b[0m',
|
||||
};
|
||||
|
||||
const sanitized = escapeAnsiCtrlCodes(details);
|
||||
|
||||
expect(sanitized.a).toBe('\\u001b[31mred\\u001b[0m');
|
||||
if (typeof sanitized.b === 'object' && sanitized.b !== null) {
|
||||
const b = sanitized.b as { c: string; d: Array<string | object> };
|
||||
expect(b.c).toBe('\\u001b[32mgreen\\u001b[0m');
|
||||
expect(b.d[0]).toBe('\\u001b[33myellow\\u001b[0m');
|
||||
if (typeof b.d[1] === 'object' && b.d[1] !== null) {
|
||||
const e = b.d[1] as { e: string };
|
||||
expect(e.e).toBe('\\u001b[34mblue\\u001b[0m');
|
||||
}
|
||||
}
|
||||
expect(sanitized.f).toBe(123);
|
||||
expect(sanitized.g).toBe(null);
|
||||
expect(sanitized.h()).toBe('\u001b[35mpurple\u001b[0m');
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -5,6 +5,7 @@
|
||||
*/
|
||||
|
||||
import stripAnsi from 'strip-ansi';
|
||||
import ansiRegex from 'ansi-regex';
|
||||
import { stripVTControlCharacters } from 'node:util';
|
||||
import stringWidth from 'string-width';
|
||||
|
||||
@@ -146,3 +147,70 @@ export const getCachedStringWidth = (str: string): number => {
|
||||
export const clearStringWidthCache = (): void => {
|
||||
stringWidthCache.clear();
|
||||
};
|
||||
|
||||
const regex = ansiRegex();
|
||||
|
||||
/* Recursively traverses a JSON-like structure (objects, arrays, primitives)
|
||||
* and escapes all ANSI control characters found in any string values.
|
||||
*
|
||||
* This function is designed to be robust, handling deeply nested objects and
|
||||
* arrays. It applies a regex-based replacement to all string values to
|
||||
* safely escape control characters.
|
||||
*
|
||||
* To optimize performance, this function uses a "copy-on-write" strategy.
|
||||
* It avoids allocating new objects or arrays if no nested string values
|
||||
* required escaping, returning the original object reference in such cases.
|
||||
*
|
||||
* @param obj The JSON-like value (object, array, string, etc.) to traverse.
|
||||
* @returns A new value with all nested string fields escaped, or the
|
||||
* original `obj` reference if no changes were necessary.
|
||||
*/
|
||||
export function escapeAnsiCtrlCodes<T>(obj: T): T {
|
||||
if (typeof obj === 'string') {
|
||||
if (obj.search(regex) === -1) {
|
||||
return obj; // No changes return original string
|
||||
}
|
||||
|
||||
regex.lastIndex = 0; // needed for global regex
|
||||
return obj.replace(regex, (match) =>
|
||||
JSON.stringify(match).slice(1, -1),
|
||||
) as T;
|
||||
}
|
||||
|
||||
if (obj === null || typeof obj !== 'object') {
|
||||
return obj;
|
||||
}
|
||||
|
||||
if (Array.isArray(obj)) {
|
||||
let newArr: unknown[] | null = null;
|
||||
|
||||
for (let i = 0; i < obj.length; i++) {
|
||||
const value = obj[i];
|
||||
const escapedValue = escapeAnsiCtrlCodes(value);
|
||||
if (escapedValue !== value) {
|
||||
if (newArr === null) {
|
||||
newArr = [...obj];
|
||||
}
|
||||
newArr[i] = escapedValue;
|
||||
}
|
||||
}
|
||||
return (newArr !== null ? newArr : obj) as T;
|
||||
}
|
||||
|
||||
let newObj: T | null = null;
|
||||
const keys = Object.keys(obj);
|
||||
|
||||
for (const key of keys) {
|
||||
const value = (obj as Record<string, unknown>)[key];
|
||||
const escapedValue = escapeAnsiCtrlCodes(value);
|
||||
|
||||
if (escapedValue !== value) {
|
||||
if (newObj === null) {
|
||||
newObj = { ...obj };
|
||||
}
|
||||
(newObj as Record<string, unknown>)[key] = escapedValue;
|
||||
}
|
||||
}
|
||||
|
||||
return newObj !== null ? newObj : obj;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user