diff --git a/‎package-lock.json‎
Lines changed: 7 additions & 0 deletions b/‎package-lock.json‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎packages/cli/src/ui/hooks/shellCommandProcessor.test.ts‎
Lines changed: 2 additions & 0 deletions b/‎packages/cli/src/ui/hooks/shellCommandProcessor.test.ts‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎packages/cli/src/ui/hooks/shellCommandProcessor.ts‎
Lines changed: 22 additions & 8 deletions b/‎packages/cli/src/ui/hooks/shellCommandProcessor.ts‎
Lines changed: 22 additions & 8 deletions
diff --git a/‎packages/core/package.json‎
Lines changed: 2 additions & 1 deletion b/‎packages/core/package.json‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎packages/core/src/index.ts‎
Lines changed: 1 addition & 0 deletions b/‎packages/core/src/index.ts‎
Lines changed: 1 addition & 0 deletions
@@ -19,9 +19,11 @@ vi.mock('os', () => ({
   default: {
     platform: () => 'linux',
     tmpdir: () => '/tmp',
+    homedir: () => '/home/user',
   },
   platform: () => 'linux',
   tmpdir: () => '/tmp',
+  homedir: () => '/home/user',
 }));
 vi.mock('@thacio/auditaria-cli-core');
 vi.mock('../utils/textUtils.js', () => ({
 
@@ -6,14 +6,18 @@
 import { t } from '@thacio/auditaria-cli-core';
 
 import { spawn } from 'child_process';
-import { StringDecoder } from 'string_decoder';
+import { TextDecoder } from 'util';
 import {
   HistoryItemWithoutId,
   IndividualToolCallDisplay,
   ToolCallStatus,
 } from '../types.js';
 import { useCallback } from 'react';
-import { Config, GeminiClient } from '@thacio/auditaria-cli-core';
+import {
+  Config,
+  GeminiClient,
+  getCachedEncodingForBuffer,
+} from '@thacio/auditaria-cli-core';
 import { type PartListUnion } from '@google/genai';
 import { formatMemoryUsage } from '../utils/formatters.js';
 import { isBinary } from '../utils/textUtils.js';
@@ -72,8 +76,8 @@ function executeShellCommand(
     });
 
     // Use decoders to handle multi-byte characters safely (for streaming output).
-    const stdoutDecoder = new StringDecoder('utf8');
-    const stderrDecoder = new StringDecoder('utf8');
+    let stdoutDecoder: TextDecoder | null = null;
+    let stderrDecoder: TextDecoder | null = null;
 
     let stdout = '';
     let stderr = '';
@@ -86,6 +90,12 @@ function executeShellCommand(
     let sniffedBytes = 0;
 
     const handleOutput = (data: Buffer, stream: 'stdout' | 'stderr') => {
+      if (!stdoutDecoder || !stderrDecoder) {
+        const encoding = getCachedEncodingForBuffer(data);
+        stdoutDecoder = new TextDecoder(encoding);
+        stderrDecoder = new TextDecoder(encoding);
+      }
+
       outputChunks.push(data);
 
       if (streamToUi && sniffedBytes < MAX_SNIFF_SIZE) {
@@ -102,8 +112,8 @@ function executeShellCommand(
 
       const decodedChunk =
         stream === 'stdout'
-          ? stdoutDecoder.write(data)
-          : stderrDecoder.write(data);
+          ? stdoutDecoder.decode(data, { stream: true })
+          : stderrDecoder.decode(data, { stream: true });
       if (stream === 'stdout') {
         stdout += stripAnsi(decodedChunk);
       } else {
@@ -161,8 +171,12 @@ function executeShellCommand(
       abortSignal.removeEventListener('abort', abortHandler);
 
       // Handle any final bytes lingering in the decoders
-      stdout += stdoutDecoder.end();
-      stderr += stderrDecoder.end();
+      if (stdoutDecoder) {
+        stdout += stdoutDecoder.decode();
+      }
+      if (stderrDecoder) {
+        stderr += stderrDecoder.decode();
+      }
 
       const finalBuffer = Buffer.concat(outputChunks);
 
 
@@ -44,7 +44,8 @@
     "simple-git": "^3.28.0",
     "strip-ansi": "^7.1.0",
     "undici": "^7.10.0",
-    "ws": "^8.18.0"
+    "ws": "^8.18.0",
+    "chardet": "^2.1.0"
   },
   "devDependencies": {
     "@types/diff": "^7.0.2",
 
@@ -35,6 +35,7 @@ export * from './utils/editor.js';
 export * from './utils/quotaErrorDetection.js';
 export * from './utils/fileUtils.js';
 export * from './utils/retry.js';
+export * from './utils/systemEncoding.js';
 
 // Export services
 export * from './services/fileDiscoveryService.js';