abbyswag/qwen-code
1
0
Fork 0
mirror of https://github.com/QwenLM/qwen-code.git synced 2025-12-19 09:33:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: derive streaming state from tool calls and isresponding state (#376)

Browse Source
This commit is contained in:
Brandon Keiji
2025-05-16 16:45:58 +00:00
committed by GitHub
parent 609757f911
commit 458fd86429
2 changed files with 62 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,6 @@ import { exec as _exec } from 'child_process';
import { useCallback } from 'react';
import { Config } from '@gemini-code/server';
import { type PartListUnion } from '@google/genai';
import { StreamingState } from '../types.js';
import { getCommandFromQuery } from '../utils/commandUtils.js';
import { UseHistoryManagerReturn } from './useHistoryManager.js';
@@ -18,7 +17,7 @@ import { UseHistoryManagerReturn } from './useHistoryManager.js';
*/
export const useShellCommandProcessor = (
addItemToHistory: UseHistoryManagerReturn['addItem'],
setStreamingState: React.Dispatch<React.SetStateAction<StreamingState>>,
onExec: (command: Promise<void>) => void,
onDebugMessage: (message: string) => void,
config: Config,
) => {
@@ -57,30 +56,36 @@ export const useShellCommandProcessor = (
cwd: targetDir,
};
setStreamingState(StreamingState.Responding);
const execPromise = new Promise<void>((resolve) => {
_exec(commandToExecute, execOptions, (error, stdout, stderr) => {
if (error) {
addItemToHistory(
{ type: 'error', text: error.message },
userMessageTimestamp,
);
} else {
let output = '';
if (stdout) output += stdout;
if (stderr) output += (output ? '\n' : '') + stderr; // Include stderr as info
_exec(commandToExecute, execOptions, (error, stdout, stderr) => {
if (error) {
addItemToHistory(
{ type: 'error', text: error.message },
userMessageTimestamp,
);
} else {
let output = '';
if (stdout) output += stdout;
if (stderr) output += (output ? '\n' : '') + stderr; // Include stderr as info
addItemToHistory(
{ type: 'info', text: output || '(Command produced no output)' },
userMessageTimestamp,
);
}
setStreamingState(StreamingState.Idle);
addItemToHistory(
{ type: 'info', text: output || '(Command produced no output)' },
userMessageTimestamp,
);
}
resolve();
});
});
try {
onExec(execPromise);
} catch (_e) {
// silently ignore errors from this since it's from the caller
}
return true; // Command was initiated
},
[config, onDebugMessage, addItemToHistory, setStreamingState],
[config, onDebugMessage, addItemToHistory, onExec],
);
return { handleShellCommand };