MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-04-08 20:30:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

Protect stdout and stderr so JavaScript code can't accidentally write to stdout corrupting ink rendering (#13247)

Browse Source 
Bypassing rules as link checker failure is spurious.
This commit is contained in:
Jacob Richman
2025-11-20 10:44:02 -08:00
committed by GitHub
parent e20d282088
commit d1e35f8660
82 changed files with 1523 additions and 868 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/cli/src/ui/utils/ConsolePatcher.ts
View File

@@ -27,11 +27,11 @@ export class ConsolePatcher {
}
patch() {
console.log = this.patchConsoleMethod('log', this.originalConsoleLog);
console.warn = this.patchConsoleMethod('warn', this.originalConsoleWarn);
console.error = this.patchConsoleMethod('error', this.originalConsoleError);
console.debug = this.patchConsoleMethod('debug', this.originalConsoleDebug);
console.info = this.patchConsoleMethod('info', this.originalConsoleInfo);
console.log = this.patchConsoleMethod('log');
console.warn = this.patchConsoleMethod('warn');
console.error = this.patchConsoleMethod('error');
console.debug = this.patchConsoleMethod('debug');
console.info = this.patchConsoleMethod('info');
}
cleanup = () => {
@@ -45,20 +45,13 @@ export class ConsolePatcher {
private formatArgs = (args: unknown[]): string => util.format(...args);
private patchConsoleMethod =
(
type: 'log' | 'warn' | 'error' | 'debug' | 'info',
originalMethod: (...args: unknown[]) => void,
) =>
(type: 'log' | 'warn' | 'error' | 'debug' | 'info') =>
(...args: unknown[]) => {
if (this.params.stderr) {
if (type !== 'debug' || this.params.debugMode) {
this.originalConsoleError(this.formatArgs(args));
}
} else {
if (this.params.debugMode) {
originalMethod.apply(console, args);
}
if (type !== 'debug' || this.params.debugMode) {
this.params.onNewMessage?.({
type,

6
packages/cli/src/ui/utils/mouse.ts
View File

@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
import process from 'node:process';
import { writeToStdout } from '../../utils/stdio.js';
import {
SGR_MOUSE_REGEX,
X11_MOUSE_REGEX,
@@ -234,10 +234,10 @@ export function enableMouseEvents() {
// Enable mouse tracking with SGR format
// ?1002h = button event tracking (clicks + drags + scroll wheel)
// ?1006h = SGR extended mouse mode (better coordinate handling)
process.stdout.write('\u001b[?1002h\u001b[?1006h');
writeToStdout('\u001b[?1002h\u001b[?1006h');
}
export function disableMouseEvents() {
// Disable mouse tracking with SGR format
process.stdout.write('\u001b[?1006l\u001b[?1002l');
writeToStdout('\u001b[?1006l\u001b[?1002l');
}