@google/gemini-cli 0.1.13 → 0.1.15-nightly.250731.0c6f7884

package/dist/src/ui/contexts/VimModeContext.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"VimModeContext.js","sourceRoot":"","sources":["../../../../src/ui/contexts/VimModeContext.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EACL,aAAa,EACb,WAAW,EACX,UAAU,EACV,SAAS,EACT,QAAQ,GACT,MAAM,OAAO,CAAC;AACf,OAAO,EAAkB,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAWxE,MAAM,cAAc,GAAG,aAAa,CAAiC,SAAS,CAAC,CAAC;AAEhF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAC9B,QAAQ,EACR,QAAQ,GAIT,EAAE,EAAE;IACH,MAAM,iBAAiB,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,IAAI,KAAK,CAAC;IAC3D,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAC;IAChE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CACpC,iBAAiB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CACxC,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,+CAA+C;QAC/C,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,IAAI,KAAK,CAAC;QACjD,aAAa,CAAC,OAAO,CAAC,CAAC;QACvB,wDAAwD;QACxD,IAAI,OAAO,EAAE,CAAC;YACZ,UAAU,CAAC,QAAQ,CAAC,CAAC;QACvB,CAAC;IACH,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAE9B,MAAM,gBAAgB,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QAC9C,MAAM,QAAQ,GAAG,CAAC,UAAU,CAAC;QAC7B,aAAa,CAAC,QAAQ,CAAC,CAAC;QACxB,+CAA+C;QAC/C,IAAI,QAAQ,EAAE,CAAC;YACb,UAAU,CAAC,QAAQ,CAAC,CAAC;QACvB,CAAC;QACD,MAAM,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;QAChE,OAAO,QAAQ,CAAC;IAClB,CAAC,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;IAE3B,MAAM,KAAK,GAAG;QACZ,UAAU;QACV,OAAO;QACP,gBAAgB;QAChB,UAAU;KACX,CAAC;IAEF,OAAO,CACL,KAAC,cAAc,CAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,YAAG,QAAQ,GAA2B,CAC5E,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,EAAE;IAC7B,MAAM,OAAO,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;IAC3C,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC"}

package/dist/src/ui/hooks/atCommandProcessor.js

@@ -85,11 +85,15 @@ export async function handleAtCommand({ query, config, addItem, onDebugMessage,
     addItem({ type: 'user', text: query }, userMessageTimestamp);
     // Get centralized file discovery service
     const fileDiscovery = config.getFileService();
-    const respectGitIgnore = config.getFileFilteringRespectGitIgnore();
+    const respectFileIgnore = config.getFileFilteringOptions();
     const pathSpecsToRead = [];
     const atPathToResolvedSpecMap = new Map();
     const contentLabelsForDisplay = [];
-    const ignoredPaths = [];
+    const ignoredByReason = {
+        git: [],
+        gemini: [],
+        both: [],
+    };
     const toolRegistry = await config.getToolRegistry();
     const readManyFilesTool = toolRegistry.getTool('read_many_files');
     const globTool = toolRegistry.getTool('glob');
@@ -116,72 +120,97 @@ export async function handleAtCommand({ query, config, addItem, onDebugMessage,
             return { processedQuery: null, shouldProceed: false };
         }
         // Check if path should be ignored based on filtering options
-        if (fileDiscovery.shouldIgnoreFile(pathName, { respectGitIgnore })) {
-            const reason = respectGitIgnore ? 'git-ignored' : 'custom-ignored';
-            onDebugMessage(`Path ${pathName} is ${reason} and will be skipped.`);
-            ignoredPaths.push(pathName);
+        const workspaceContext = config.getWorkspaceContext();
+        if (!workspaceContext.isPathWithinWorkspace(pathName)) {
+            onDebugMessage(`Path ${pathName} is not in the workspace and will be skipped.`);
             continue;
         }
-        let currentPathSpec = pathName;
-        let resolvedSuccessfully = false;
-        try {
-            const absolutePath = path.resolve(config.getTargetDir(), pathName);
-            const stats = await fs.stat(absolutePath);
-            if (stats.isDirectory()) {
-                currentPathSpec = pathName.endsWith('/')
-                    ? `${pathName}**`
-                    : `${pathName}/**`;
-                onDebugMessage(`Path ${pathName} resolved to directory, using glob: ${currentPathSpec}`);
-            }
-            else {
-                onDebugMessage(`Path ${pathName} resolved to file: ${currentPathSpec}`);
-            }
-            resolvedSuccessfully = true;
+        const gitIgnored = respectFileIgnore.respectGitIgnore &&
+            fileDiscovery.shouldIgnoreFile(pathName, {
+                respectGitIgnore: true,
+                respectGeminiIgnore: false,
+            });
+        const geminiIgnored = respectFileIgnore.respectGeminiIgnore &&
+            fileDiscovery.shouldIgnoreFile(pathName, {
+                respectGitIgnore: false,
+                respectGeminiIgnore: true,
+            });
+        if (gitIgnored || geminiIgnored) {
+            const reason = gitIgnored && geminiIgnored ? 'both' : gitIgnored ? 'git' : 'gemini';
+            ignoredByReason[reason].push(pathName);
+            const reasonText = reason === 'both'
+                ? 'ignored by both git and gemini'
+                : reason === 'git'
+                    ? 'git-ignored'
+                    : 'gemini-ignored';
+            onDebugMessage(`Path ${pathName} is ${reasonText} and will be skipped.`);
+            continue;
         }
-        catch (error) {
-            if (isNodeError(error) && error.code === 'ENOENT') {
-                if (config.getEnableRecursiveFileSearch() && globTool) {
-                    onDebugMessage(`Path ${pathName} not found directly, attempting glob search.`);
-                    try {
-                        const globResult = await globTool.execute({ pattern: `**/*${pathName}*`, path: config.getTargetDir() }, signal);
-                        if (globResult.llmContent &&
-                            typeof globResult.llmContent === 'string' &&
-                            !globResult.llmContent.startsWith('No files found') &&
-                            !globResult.llmContent.startsWith('Error:')) {
-                            const lines = globResult.llmContent.split('\n');
-                            if (lines.length > 1 && lines[1]) {
-                                const firstMatchAbsolute = lines[1].trim();
-                                currentPathSpec = path.relative(config.getTargetDir(), firstMatchAbsolute);
-                                onDebugMessage(`Glob search for ${pathName} found ${firstMatchAbsolute}, using relative path: ${currentPathSpec}`);
-                                resolvedSuccessfully = true;
+        for (const dir of config.getWorkspaceContext().getDirectories()) {
+            let currentPathSpec = pathName;
+            let resolvedSuccessfully = false;
+            try {
+                const absolutePath = path.resolve(dir, pathName);
+                const stats = await fs.stat(absolutePath);
+                if (stats.isDirectory()) {
+                    currentPathSpec =
+                        pathName + (pathName.endsWith(path.sep) ? `**` : `/**`);
+                    onDebugMessage(`Path ${pathName} resolved to directory, using glob: ${currentPathSpec}`);
+                }
+                else {
+                    onDebugMessage(`Path ${pathName} resolved to file: ${absolutePath}`);
+                }
+                resolvedSuccessfully = true;
+            }
+            catch (error) {
+                if (isNodeError(error) && error.code === 'ENOENT') {
+                    if (config.getEnableRecursiveFileSearch() && globTool) {
+                        onDebugMessage(`Path ${pathName} not found directly, attempting glob search.`);
+                        try {
+                            const globResult = await globTool.execute({
+                                pattern: `**/*${pathName}*`,
+                                path: dir,
+                            }, signal);
+                            if (globResult.llmContent &&
+                                typeof globResult.llmContent === 'string' &&
+                                !globResult.llmContent.startsWith('No files found') &&
+                                !globResult.llmContent.startsWith('Error:')) {
+                                const lines = globResult.llmContent.split('\n');
+                                if (lines.length > 1 && lines[1]) {
+                                    const firstMatchAbsolute = lines[1].trim();
+                                    currentPathSpec = path.relative(dir, firstMatchAbsolute);
+                                    onDebugMessage(`Glob search for ${pathName} found ${firstMatchAbsolute}, using relative path: ${currentPathSpec}`);
+                                    resolvedSuccessfully = true;
+                                }
+                                else {
+                                    onDebugMessage(`Glob search for '**/*${pathName}*' did not return a usable path. Path ${pathName} will be skipped.`);
+                                }
                             }
                             else {
-                                onDebugMessage(`Glob search for '**/*${pathName}*' did not return a usable path. Path ${pathName} will be skipped.`);
+                                onDebugMessage(`Glob search for '**/*${pathName}*' found no files or an error. Path ${pathName} will be skipped.`);
                             }
                         }
-                        else {
-                            onDebugMessage(`Glob search for '**/*${pathName}*' found no files or an error. Path ${pathName} will be skipped.`);
+                        catch (globError) {
+                            console.error(`Error during glob search for ${pathName}: ${getErrorMessage(globError)}`);
+                            onDebugMessage(`Error during glob search for ${pathName}. Path ${pathName} will be skipped.`);
                         }
                     }
-                    catch (globError) {
-                        console.error(`Error during glob search for ${pathName}: ${getErrorMessage(globError)}`);
-                        onDebugMessage(`Error during glob search for ${pathName}. Path ${pathName} will be skipped.`);
+                    else {
+                        onDebugMessage(`Glob tool not found. Path ${pathName} will be skipped.`);
                     }
                 }
                 else {
-                    onDebugMessage(`Glob tool not found. Path ${pathName} will be skipped.`);
+                    console.error(`Error stating path ${pathName}: ${getErrorMessage(error)}`);
+                    onDebugMessage(`Error stating path ${pathName}. Path ${pathName} will be skipped.`);
                 }
             }
-            else {
-                console.error(`Error stating path ${pathName}: ${getErrorMessage(error)}`);
-                onDebugMessage(`Error stating path ${pathName}. Path ${pathName} will be skipped.`);
+            if (resolvedSuccessfully) {
+                pathSpecsToRead.push(currentPathSpec);
+                atPathToResolvedSpecMap.set(originalAtPath, currentPathSpec);
+                contentLabelsForDisplay.push(pathName);
+                break;
             }
         }
-        if (resolvedSuccessfully) {
-            pathSpecsToRead.push(currentPathSpec);
-            atPathToResolvedSpecMap.set(originalAtPath, currentPathSpec);
-            contentLabelsForDisplay.push(pathName);
-        }
     }
     // Construct the initial part of the query for the LLM
     let initialQueryText = '';
@@ -223,9 +252,23 @@ export async function handleAtCommand({ query, config, addItem, onDebugMessage,
     }
     initialQueryText = initialQueryText.trim();
     // Inform user about ignored paths
-    if (ignoredPaths.length > 0) {
-        const ignoreType = respectGitIgnore ? 'git-ignored' : 'custom-ignored';
-        onDebugMessage(`Ignored ${ignoredPaths.length} ${ignoreType} files: ${ignoredPaths.join(', ')}`);
+    const totalIgnored = ignoredByReason.git.length +
+        ignoredByReason.gemini.length +
+        ignoredByReason.both.length;
+    if (totalIgnored > 0) {
+        const messages = [];
+        if (ignoredByReason.git.length) {
+            messages.push(`Git-ignored: ${ignoredByReason.git.join(', ')}`);
+        }
+        if (ignoredByReason.gemini.length) {
+            messages.push(`Gemini-ignored: ${ignoredByReason.gemini.join(', ')}`);
+        }
+        if (ignoredByReason.both.length) {
+            messages.push(`Ignored by both: ${ignoredByReason.both.join(', ')}`);
+        }
+        const message = `Ignored ${totalIgnored} files:\n${messages.join('\n')}`;
+        console.log(message);
+        onDebugMessage(message);
     }
     // Fallback for lone "@" or completely invalid @-commands resulting in empty initialQueryText
     if (pathSpecsToRead.length === 0) {
@@ -247,7 +290,11 @@ export async function handleAtCommand({ query, config, addItem, onDebugMessage,
     const processedQueryParts = [{ text: initialQueryText }];
     const toolArgs = {
         paths: pathSpecsToRead,
-        respect_git_ignore: respectGitIgnore, // Use configuration setting
+        file_filtering_options: {
+            respect_git_ignore: respectFileIgnore.respectGitIgnore,
+            respect_gemini_ignore: respectFileIgnore.respectGeminiIgnore,
+        },
+        // Use configuration setting
     };
     let toolCallDisplay;
     try {

package/dist/src/ui/hooks/atCommandProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"atCommandProcessor.js","sourceRoot":"","sources":["../../../../src/ui/hooks/atCommandProcessor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"atCommandProcessor.js","sourceRoot":"","sources":["../../../../src/ui/hooks/atCommandProcessor.ts"],"names":[],"mappings":"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"}

package/dist/src/ui/hooks/shellCommandProcessor.d.ts

@@ -7,6 +7,7 @@ import { HistoryItemWithoutId } from '../types.js';
 import { Config, GeminiClient } from '@google/gemini-cli-core';
 import { type PartListUnion } from '@google/genai';
 import { UseHistoryManagerReturn } from './useHistoryManager.js';
+export declare const OUTPUT_UPDATE_INTERVAL_MS = 1000;
 /**
  * Hook to process shell commands.
  * Orchestrates command execution and updates history and agent context.

package/dist/src/ui/hooks/shellCommandProcessor.js

@@ -3,134 +3,17 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { spawn } from 'child_process';
-import { StringDecoder } from 'string_decoder';
 import { ToolCallStatus, } from '../types.js';
 import { useCallback } from 'react';
-import { formatMemoryUsage } from '../utils/formatters.js';
-import { isBinary } from '../utils/textUtils.js';
+import { isBinary, ShellExecutionService, } from '@google/gemini-cli-core';
 import { SHELL_COMMAND_NAME } from '../constants.js';
+import { formatMemoryUsage } from '../utils/formatters.js';
 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;
+export const OUTPUT_UPDATE_INTERVAL_MS = 1000;
 const MAX_OUTPUT_LENGTH = 10000;
-/**
- * Executes a shell command using `spawn`, capturing all output and lifecycle events.
- * This is the single, unified implementation for shell execution.
- *
- * @param commandToExecute The exact command string to run.
- * @param cwd The working directory to execute the command in.
- * @param abortSignal An AbortSignal to terminate the process.
- * @param onOutputChunk A callback for streaming real-time output.
- * @param onDebugMessage A callback for logging debug information.
- * @returns A promise that resolves with the complete execution result.
- */
-function executeShellCommand(commandToExecute, cwd, abortSignal, onOutputChunk, onDebugMessage) {
-    return new Promise((resolve) => {
-        const isWindows = os.platform() === 'win32';
-        const shell = isWindows ? 'cmd.exe' : 'bash';
-        const shellArgs = isWindows
-            ? ['/c', commandToExecute]
-            : ['-c', commandToExecute];
-        const child = spawn(shell, shellArgs, {
-            cwd,
-            stdio: ['ignore', 'pipe', 'pipe'],
-            detached: !isWindows, // Use process groups on non-Windows for robust killing
-        });
-        // Use decoders to handle multi-byte characters safely (for streaming output).
-        const stdoutDecoder = new StringDecoder('utf8');
-        const stderrDecoder = new StringDecoder('utf8');
-        let stdout = '';
-        let stderr = '';
-        const outputChunks = [];
-        let error = null;
-        let exited = false;
-        let streamToUi = true;
-        const MAX_SNIFF_SIZE = 4096;
-        let sniffedBytes = 0;
-        const handleOutput = (data, stream) => {
-            outputChunks.push(data);
-            if (streamToUi && sniffedBytes < MAX_SNIFF_SIZE) {
-                // Use a limited-size buffer for the check to avoid performance issues.
-                const sniffBuffer = Buffer.concat(outputChunks.slice(0, 20));
-                sniffedBytes = sniffBuffer.length;
-                if (isBinary(sniffBuffer)) {
-                    streamToUi = false;
-                    // Overwrite any garbled text that may have streamed with a clear message.
-                    onOutputChunk('[Binary output detected. Halting stream...]');
-                }
-            }
-            const decodedChunk = stream === 'stdout'
-                ? stdoutDecoder.write(data)
-                : stderrDecoder.write(data);
-            if (stream === 'stdout') {
-                stdout += stripAnsi(decodedChunk);
-            }
-            else {
-                stderr += stripAnsi(decodedChunk);
-            }
-            if (!exited && streamToUi) {
-                // Send only the new chunk to avoid re-rendering the whole output.
-                const combinedOutput = stdout + (stderr ? `\n${stderr}` : '');
-                onOutputChunk(combinedOutput);
-            }
-            else if (!exited && !streamToUi) {
-                // Send progress updates for the binary stream
-                const totalBytes = outputChunks.reduce((sum, chunk) => sum + chunk.length, 0);
-                onOutputChunk(`[Receiving binary output... ${formatMemoryUsage(totalBytes)} received]`);
-            }
-        };
-        child.stdout.on('data', (data) => handleOutput(data, 'stdout'));
-        child.stderr.on('data', (data) => handleOutput(data, 'stderr'));
-        child.on('error', (err) => {
-            error = err;
-        });
-        const abortHandler = async () => {
-            if (child.pid && !exited) {
-                onDebugMessage(`Aborting shell command (PID: ${child.pid})`);
-                if (isWindows) {
-                    spawn('taskkill', ['/pid', child.pid.toString(), '/f', '/t']);
-                }
-                else {
-                    try {
-                        // Kill the entire process group (negative PID).
-                        // SIGTERM first, then SIGKILL if it doesn't die.
-                        process.kill(-child.pid, 'SIGTERM');
-                        await new Promise((res) => setTimeout(res, 200));
-                        if (!exited) {
-                            process.kill(-child.pid, 'SIGKILL');
-                        }
-                    }
-                    catch (_e) {
-                        // Fallback to killing just the main process if group kill fails.
-                        if (!exited)
-                            child.kill('SIGKILL');
-                    }
-                }
-            }
-        };
-        abortSignal.addEventListener('abort', abortHandler, { once: true });
-        child.on('exit', (code, signal) => {
-            exited = true;
-            abortSignal.removeEventListener('abort', abortHandler);
-            // Handle any final bytes lingering in the decoders
-            stdout += stdoutDecoder.end();
-            stderr += stderrDecoder.end();
-            const finalBuffer = Buffer.concat(outputChunks);
-            resolve({
-                rawOutput: finalBuffer,
-                output: stdout + (stderr ? `\n${stderr}` : ''),
-                exitCode: code,
-                signal,
-                error,
-                aborted: abortSignal.aborted,
-            });
-        });
-    });
-}
 function addShellCommandToGeminiHistory(geminiClient, rawQuery, resultText) {
     const modelContent = resultText.length > MAX_OUTPUT_LENGTH
         ? resultText.substring(0, MAX_OUTPUT_LENGTH) + '\n... (truncated)'
@@ -180,7 +63,11 @@ export const useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem
             commandToExecute = `{ ${command} }; __code=$?; pwd > "${pwdFilePath}"; exit $__code`;
         }
         const execPromise = new Promise((resolve) => {
-            let lastUpdateTime = 0;
+            let lastUpdateTime = Date.now();
+            let cumulativeStdout = '';
+            let cumulativeStderr = '';
+            let isBinaryStream = false;
+            let binaryBytesReceived = 0;
             const initialToolDisplay = {
                 callId,
                 name: SHELL_COMMAND_NAME,
@@ -193,85 +80,151 @@ export const useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem
                 type: 'tool_group',
                 tools: [initialToolDisplay],
             });
+            let executionPid;
+            const abortHandler = () => {
+                onDebugMessage(`Aborting shell command (PID: ${executionPid ?? 'unknown'})`);
+            };
+            abortSignal.addEventListener('abort', abortHandler, { once: true });
             onDebugMessage(`Executing in ${targetDir}: ${commandToExecute}`);
-            executeShellCommand(commandToExecute, targetDir, abortSignal, (streamedOutput) => {
-                // Throttle pending UI updates to avoid excessive re-renders.
-                if (Date.now() - lastUpdateTime > OUTPUT_UPDATE_INTERVAL_MS) {
-                    setPendingHistoryItem({
+            try {
+                const { pid, result } = ShellExecutionService.execute(commandToExecute, targetDir, (event) => {
+                    switch (event.type) {
+                        case 'data':
+                            // Do not process text data if we've already switched to binary mode.
+                            if (isBinaryStream)
+                                break;
+                            if (event.stream === 'stdout') {
+                                cumulativeStdout += event.chunk;
+                            }
+                            else {
+                                cumulativeStderr += event.chunk;
+                            }
+                            break;
+                        case 'binary_detected':
+                            isBinaryStream = true;
+                            break;
+                        case 'binary_progress':
+                            isBinaryStream = true;
+                            binaryBytesReceived = event.bytesReceived;
+                            break;
+                        default: {
+                            throw new Error('An unhandled ShellOutputEvent was found.');
+                        }
+                    }
+                    // Compute the display string based on the *current* state.
+                    let currentDisplayOutput;
+                    if (isBinaryStream) {
+                        if (binaryBytesReceived > 0) {
+                            currentDisplayOutput = `[Receiving binary output... ${formatMemoryUsage(binaryBytesReceived)} received]`;
+                        }
+                        else {
+                            currentDisplayOutput =
+                                '[Binary output detected. Halting stream...]';
+                        }
+                    }
+                    else {
+                        currentDisplayOutput =
+                            cumulativeStdout +
+                                (cumulativeStderr ? `\n${cumulativeStderr}` : '');
+                    }
+                    // Throttle pending UI updates to avoid excessive re-renders.
+                    if (Date.now() - lastUpdateTime > OUTPUT_UPDATE_INTERVAL_MS) {
+                        setPendingHistoryItem({
+                            type: 'tool_group',
+                            tools: [
+                                {
+                                    ...initialToolDisplay,
+                                    resultDisplay: currentDisplayOutput,
+                                },
+                            ],
+                        });
+                        lastUpdateTime = Date.now();
+                    }
+                }, abortSignal);
+                executionPid = pid;
+                result
+                    .then((result) => {
+                    setPendingHistoryItem(null);
+                    let mainContent;
+                    if (isBinary(result.rawOutput)) {
+                        mainContent =
+                            '[Command produced binary output, which is not shown.]';
+                    }
+                    else {
+                        mainContent =
+                            result.output.trim() || '(Command produced no output)';
+                    }
+                    let finalOutput = mainContent;
+                    let finalStatus = ToolCallStatus.Success;
+                    if (result.error) {
+                        finalStatus = ToolCallStatus.Error;
+                        finalOutput = `${result.error.message}\n${finalOutput}`;
+                    }
+                    else if (result.aborted) {
+                        finalStatus = ToolCallStatus.Canceled;
+                        finalOutput = `Command was cancelled.\n${finalOutput}`;
+                    }
+                    else if (result.signal) {
+                        finalStatus = ToolCallStatus.Error;
+                        finalOutput = `Command terminated by signal: ${result.signal}.\n${finalOutput}`;
+                    }
+                    else if (result.exitCode !== 0) {
+                        finalStatus = ToolCallStatus.Error;
+                        finalOutput = `Command exited with code ${result.exitCode}.\n${finalOutput}`;
+                    }
+                    if (pwdFilePath && fs.existsSync(pwdFilePath)) {
+                        const finalPwd = fs.readFileSync(pwdFilePath, 'utf8').trim();
+                        if (finalPwd && finalPwd !== targetDir) {
+                            const warning = `WARNING: shell mode is stateless; the directory change to '${finalPwd}' will not persist.`;
+                            finalOutput = `${warning}\n\n${finalOutput}`;
+                        }
+                    }
+                    const finalToolDisplay = {
+                        ...initialToolDisplay,
+                        status: finalStatus,
+                        resultDisplay: finalOutput,
+                    };
+                    // Add the complete, contextual result to the local UI history.
+                    addItemToHistory({
                         type: 'tool_group',
-                        tools: [
-                            { ...initialToolDisplay, resultDisplay: streamedOutput },
-                        ],
-                    });
-                    lastUpdateTime = Date.now();
-                }
-            }, onDebugMessage)
-                .then((result) => {
-                setPendingHistoryItem(null);
-                let mainContent;
-                if (isBinary(result.rawOutput)) {
-                    mainContent =
-                        '[Command produced binary output, which is not shown.]';
-                }
-                else {
-                    mainContent =
-                        result.output.trim() || '(Command produced no output)';
-                }
-                let finalOutput = mainContent;
-                let finalStatus = ToolCallStatus.Success;
-                if (result.error) {
-                    finalStatus = ToolCallStatus.Error;
-                    finalOutput = `${result.error.message}\n${finalOutput}`;
-                }
-                else if (result.aborted) {
-                    finalStatus = ToolCallStatus.Canceled;
-                    finalOutput = `Command was cancelled.\n${finalOutput}`;
-                }
-                else if (result.signal) {
-                    finalStatus = ToolCallStatus.Error;
-                    finalOutput = `Command terminated by signal: ${result.signal}.\n${finalOutput}`;
-                }
-                else if (result.exitCode !== 0) {
-                    finalStatus = ToolCallStatus.Error;
-                    finalOutput = `Command exited with code ${result.exitCode}.\n${finalOutput}`;
-                }
-                if (pwdFilePath && fs.existsSync(pwdFilePath)) {
-                    const finalPwd = fs.readFileSync(pwdFilePath, 'utf8').trim();
-                    if (finalPwd && finalPwd !== targetDir) {
-                        const warning = `WARNING: shell mode is stateless; the directory change to '${finalPwd}' will not persist.`;
-                        finalOutput = `${warning}\n\n${finalOutput}`;
+                        tools: [finalToolDisplay],
+                    }, userMessageTimestamp);
+                    // Add the same complete, contextual result to the LLM's history.
+                    addShellCommandToGeminiHistory(geminiClient, rawQuery, finalOutput);
+                })
+                    .catch((err) => {
+                    setPendingHistoryItem(null);
+                    const errorMessage = err instanceof Error ? err.message : String(err);
+                    addItemToHistory({
+                        type: 'error',
+                        text: `An unexpected error occurred: ${errorMessage}`,
+                    }, userMessageTimestamp);
+                })
+                    .finally(() => {
+                    abortSignal.removeEventListener('abort', abortHandler);
+                    if (pwdFilePath && fs.existsSync(pwdFilePath)) {
+                        fs.unlinkSync(pwdFilePath);
                     }
-                }
-                const finalToolDisplay = {
-                    ...initialToolDisplay,
-                    status: finalStatus,
-                    resultDisplay: finalOutput,
-                };
-                // Add the complete, contextual result to the local UI history.
-                addItemToHistory({
-                    type: 'tool_group',
-                    tools: [finalToolDisplay],
-                }, userMessageTimestamp);
-                // Add the same complete, contextual result to the LLM's history.
-                addShellCommandToGeminiHistory(geminiClient, rawQuery, finalOutput);
-            })
-                .catch((err) => {
+                    resolve();
+                });
+            }
+            catch (err) {
+                // This block handles synchronous errors from `execute`
                 setPendingHistoryItem(null);
                 const errorMessage = err instanceof Error ? err.message : String(err);
                 addItemToHistory({
                     type: 'error',
                     text: `An unexpected error occurred: ${errorMessage}`,
                 }, userMessageTimestamp);
-            })
-                .finally(() => {
+                // Perform cleanup here as well
                 if (pwdFilePath && fs.existsSync(pwdFilePath)) {
                     fs.unlinkSync(pwdFilePath);
                 }
-                resolve();
-            });
+                resolve(); // Resolve the promise to unblock `onExec`
+            }
         });
         onExec(execPromise);
-        return true; // Command was initiated
+        return true;
     }, [
         config,
         onDebugMessage,