summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlcan <[email protected]>2025-06-02 14:50:12 -0700
committerGitHub <[email protected]>2025-06-02 14:50:12 -0700
commit1dcf0a4cbdee249fd9a20c67b9b718563353773b (patch)
treed858433eafd111282f4f3e3c730dcfe350cf7d37
parent51949f3121dd924002974a4e50f5ee34fd14c3ef (diff)
strip ansi from shell output (#699)
-rw-r--r--packages/cli/src/ui/hooks/shellCommandProcessor.ts5
-rw-r--r--packages/core/src/tools/shell.ts6
2 files changed, 7 insertions, 4 deletions
diff --git a/packages/cli/src/ui/hooks/shellCommandProcessor.ts b/packages/cli/src/ui/hooks/shellCommandProcessor.ts
index 111df009..156b8eb6 100644
--- a/packages/cli/src/ui/hooks/shellCommandProcessor.ts
+++ b/packages/cli/src/ui/hooks/shellCommandProcessor.ts
@@ -15,6 +15,7 @@ import crypto from 'crypto';
import path from 'path';
import os from 'os';
import fs from 'fs';
+import stripAnsi from 'strip-ansi';
const OUTPUT_UPDATE_INTERVAL_MS = 1000;
@@ -126,12 +127,12 @@ export const useShellCommandProcessor = (
let exited = false;
let output = '';
let lastUpdateTime = Date.now();
- const handleOutput = (data: string) => {
+ const handleOutput = (data: Buffer) => {
// continue to consume post-exit for background processes
// removing listeners can overflow OS buffer and block subprocesses
// destroying (e.g. child.stdout.destroy()) can terminate subprocesses via SIGPIPE
if (!exited) {
- output += data;
+ output += stripAnsi(data.toString());
if (Date.now() - lastUpdateTime > OUTPUT_UPDATE_INTERVAL_MS) {
setPendingHistoryItem({
type: 'info',
diff --git a/packages/core/src/tools/shell.ts b/packages/core/src/tools/shell.ts
index d0cad218..53e2bbf3 100644
--- a/packages/core/src/tools/shell.ts
+++ b/packages/core/src/tools/shell.ts
@@ -18,6 +18,8 @@ import {
} from './tools.js';
import { SchemaValidator } from '../utils/schemaValidator.js';
import { getErrorMessage } from '../utils/errors.js';
+import stripAnsi from 'strip-ansi';
+
export interface ShellToolParams {
command: string;
description?: string;
@@ -177,7 +179,7 @@ export class ShellTool extends BaseTool<ShellToolParams, ToolResult> {
// removing listeners can overflow OS buffer and block subprocesses
// destroying (e.g. shell.stdout.destroy()) can terminate subprocesses via SIGPIPE
if (!exited) {
- const str = data.toString();
+ const str = stripAnsi(data.toString());
stdout += str;
appendOutput(str);
}
@@ -186,7 +188,7 @@ export class ShellTool extends BaseTool<ShellToolParams, ToolResult> {
let stderr = '';
shell.stderr.on('data', (data: Buffer) => {
if (!exited) {
- const str = data.toString();
+ const str = stripAnsi(data.toString());
stderr += str;
appendOutput(str);
}