Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion gui/src/redux/thunks/streamNormalInput.ts
Original file line number Diff line number Diff line change
Expand Up @@ -254,12 +254,17 @@ export const streamNormalInput = createAsyncThunk<

// 2. Pre-process args to catch invalid args before checking policies
const state2 = getState();
if (streamAborter.signal.aborted || !state2.session.isStreaming) {
return;
}
const generatedCalls2 = selectPendingToolCalls(state2);
await preprocessToolCalls(dispatch, extra.ideMessenger, generatedCalls2);

// 3. Security check: evaluate updated policies based on args
const state3 = getState();

if (streamAborter.signal.aborted || !state3.session.isStreaming) {
return;
}
const generatedCalls3 = selectPendingToolCalls(state3);
const toolPolicies = state3.ui.toolSettings;
const policies = await evaluateToolPolicies(
Expand All @@ -283,6 +288,9 @@ export const streamNormalInput = createAsyncThunk<
// auto stream cases increase thunk depth by 1
const state4 = getState();
const generatedCalls4 = selectPendingToolCalls(state4);
if (streamAborter.signal.aborted || !state4.session.isStreaming) {
return;
}
if (generatedCalls4.length > 0) {
// All that didn't fail are auto approved - call them
await Promise.all(
Expand Down
5 changes: 0 additions & 5 deletions gui/src/redux/thunks/streamResponse.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1068,11 +1068,6 @@ describe("streamResponseThunk", () => {
type: "session/abortStream",
payload: undefined,
},
// Stream end cleanup
{
type: "session/setInactive",
payload: undefined,
},
{
type: "chat/streamNormalInput/fulfilled",
meta: {
Expand Down
Loading