jcarr
/
gemini-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix exit code for shell mode also (#466)

This commit is contained in:
Olcan 2025-05-21 09:00:54 -07:00 committed by GitHub
parent c9de822930
commit 8a70b98d1d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/cli/src/ui/hooks/shellCommandProcessor.test.ts
View File

@ -155,7 +155,7 @@ describe('useShellCommandProcessor', () => {
expect.stringContaining('Executing shell command in /current/dir:'), expect.stringContaining('Executing shell command in /current/dir:'),
); );
expect(mockExecuteCommand).toHaveBeenCalledWith( expect(mockExecuteCommand).toHaveBeenCalledWith(
'{ !ls -l; }; pwd >/tmp/shell_pwd_randomBytes.tmp', '{ !ls -l; }; __code=$?; pwd >/tmp/shell_pwd_randomBytes.tmp; exit $__code',
{ cwd: '/current/dir' }, { cwd: '/current/dir' },
expect.any(Function), expect.any(Function),
); );
@ -272,7 +272,7 @@ describe('useShellCommandProcessor', () => {
expect.any(Number), expect.any(Number),
); );
expect(mockExecuteCommand).toHaveBeenCalledWith( expect(mockExecuteCommand).toHaveBeenCalledWith(
'{ !sleep 5 & }; pwd >/tmp/shell_pwd_randomBytes.tmp', '{ !sleep 5 & }; __code=$?; pwd >/tmp/shell_pwd_randomBytes.tmp; exit $__code',
{ cwd: '/current/dir' }, { cwd: '/current/dir' },
expect.any(Function), expect.any(Function),
); );

2
packages/cli/src/ui/hooks/shellCommandProcessor.ts
View File

@ -43,7 +43,7 @@ export const useShellCommandProcessor = (
const pwdFilePath = path.join(os.tmpdir(), pwdFileName); const pwdFilePath = path.join(os.tmpdir(), pwdFileName);
if (!commandToExecute.endsWith('&')) commandToExecute += ';'; if (!commandToExecute.endsWith('&')) commandToExecute += ';';
// note here we could also restore a previous pwd with `cd {cwd}; { ... }` // note here we could also restore a previous pwd with `cd {cwd}; { ... }`
commandToExecute = `{ ${commandToExecute} }; pwd >${pwdFilePath}`; commandToExecute = `{ ${commandToExecute} }; __code=$?; pwd >${pwdFilePath}; exit $__code`;
const userMessageTimestamp = Date.now(); const userMessageTimestamp = Date.now();
addItemToHistory( addItemToHistory(