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

Fix shell output display (#24490)

Browse Source
This commit is contained in:
Jacob Richman
2026-04-01 22:53:46 -07:00
committed by GitHub
parent 973092df50
commit 40b73c9447
10 changed files with 240 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
packages/core/src/tools/shell.ts
View File

@@ -661,33 +661,34 @@ export class ShellToolInvocation extends BaseToolInvocation<
llmContent = llmContentParts.join('\n');
}
let returnDisplayMessage = '';
let returnDisplay: string | AnsiOutput = '';
if (this.context.config.getDebugMode()) {
returnDisplayMessage = llmContent;
returnDisplay = llmContent;
} else {
if (this.params.is_background || result.backgrounded) {
returnDisplayMessage = `Command moved to background (PID: ${result.pid}). Output hidden. Press Ctrl+B to view.`;
returnDisplay = `Command moved to background (PID: ${result.pid}). Output hidden. Press Ctrl+B to view.`;
} else if (result.aborted) {
const cancelMsg = timeoutMessage || 'Command cancelled by user.';
if (result.output.trim()) {
returnDisplayMessage = `${cancelMsg}\n\nOutput before cancellation:\n${result.output}`;
returnDisplay = `${cancelMsg}\n\nOutput before cancellation:\n${result.output}`;
} else {
returnDisplayMessage = cancelMsg;
returnDisplay = cancelMsg;
}
} else if (result.output.trim()) {
returnDisplayMessage = result.output;
} else if (result.output.trim() || result.ansiOutput) {
returnDisplay =
result.ansiOutput && result.ansiOutput.length > 0
? result.ansiOutput
: result.output;
} else {
if (result.signal) {
returnDisplayMessage = `Command terminated by signal: ${result.signal}`;
returnDisplay = `Command terminated by signal: ${result.signal}`;
} else if (result.error) {
returnDisplayMessage = `Command failed: ${getErrorMessage(
result.error,
)}`;
returnDisplay = `Command failed: ${getErrorMessage(result.error)}`;
} else if (result.exitCode !== null && result.exitCode !== 0) {
returnDisplayMessage = `Command exited with code: ${result.exitCode}`;
returnDisplay = `Command exited with code: ${result.exitCode}`;
}
// If output is empty and command succeeded (code 0, no error/signal/abort),
// returnDisplayMessage will remain empty, which is fine.
// returnDisplay will remain empty, which is fine.
}
}
@@ -824,7 +825,7 @@ export class ShellToolInvocation extends BaseToolInvocation<
return {
llmContent: 'Sandbox expansion required',
returnDisplay: returnDisplayMessage,
returnDisplay,
error: {
type: ToolErrorType.SANDBOX_EXPANSION_REQUIRED,
message: JSON.stringify(confirmationDetails),
@@ -856,14 +857,14 @@ export class ShellToolInvocation extends BaseToolInvocation<
);
return {
llmContent: summary,
returnDisplay: returnDisplayMessage,
returnDisplay,
...executionError,
};
}
return {
llmContent,
returnDisplay: returnDisplayMessage,
returnDisplay,
data,
...executionError,
};