Skip to content

refactor: change work function to loop and streamline message streaming and handling logic #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
janole merged 2 commits into from
Sep 24, 2025
Merged

refactor: change work function to loop and streamline message streaming and handling logic #43

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5fb327
refactor: change work function to loop and streamline message streami…
janole Sep 24, 2025
a5969d0
refactor: remove unnecessary session.flush call in work function
janole Sep 24, 2025
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
97 changes: 48 additions & 49 deletions src/ai/work.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,77 +17,76 @@ async function work(props: WorkProps)
{
const { session, chatService, signal } = props;

const messages = await workTools({ ...props, session });

if (needsToolConfirmation(messages))
while (true)
{
return messages;
}
const messages = await workTools({ ...props, session });

let aiMessage: AIMessageChunk | undefined = undefined;
let toolProgressMessages: ToolProgressMessage[] = [];

if (session.streaming)
{
const { result: stream, error } = await tryCatch(chatService.stream(session, signal));

if (!stream)
if (needsToolConfirmation(messages))
{
messages.push(new ErrorMessage(`ERROR: ${error?.message || error?.toString() || "llm.stream(...) failed."}`, "error", error));
return messages;
}

for await (const chunk of stream)
let aiMessage: AIMessageChunk | undefined = undefined;
let toolProgressMessages: ToolProgressMessage[] = [];

if (session.streaming)
{
aiMessage = aiMessage !== undefined ? concat(aiMessage, chunk) : chunk;
setMessageIsStreaming(aiMessage, true);
const { result: stream, error } = await tryCatch(chatService.stream(session, signal));

if (!aiMessage?.tool_calls?.length && !aiMessage?.tool_call_chunks?.length)
if (!stream)
{
session.setMessages([...messages, aiMessage]);
messages.push(new ErrorMessage(`ERROR: ${error?.message || error?.toString() || "llm.stream(...) failed."}`, "error", error));
return messages;
}
else

for await (const chunk of stream)
{
toolProgressMessages = ToolProgressMessage.createFromChunks(aiMessage.tool_call_chunks);
aiMessage = aiMessage !== undefined ? concat(aiMessage, chunk) : chunk;
setMessageIsStreaming(aiMessage, true);

if (toolProgressMessages.length)
if (!aiMessage?.tool_calls?.length && !aiMessage?.tool_call_chunks?.length)
{
session.setMessages([...messages, aiMessage, ...toolProgressMessages]);
session.setMessages([...messages, aiMessage]);
}
else
{
toolProgressMessages = ToolProgressMessage.createFromChunks(aiMessage.tool_call_chunks);

if (toolProgressMessages.length)
{
session.setMessages([...messages, aiMessage, ...toolProgressMessages]);
}
}
}
}
}
else
{
const { result, error } = await tryCatch(chatService.generate(session, signal));

if (!result || error)
else
{
messages.push(new ErrorMessage(`ERROR: ${error?.message || error?.toString() || "llm.generate(...) failed."}`, "error", error));
return messages;
}
const { result, error } = await tryCatch(chatService.generate(session, signal));

aiMessage = result;
}

if (aiMessage)
{
setMessageIsStreaming(aiMessage, false);
messages.push(aiMessage);
}
if (!result || error)
{
messages.push(new ErrorMessage(`ERROR: ${error?.message || error?.toString() || "llm.generate(...) failed."}`, "error", error));
return messages;
}

if (!aiMessage?.tool_calls?.length)
{
return messages;
}
aiMessage = result;
}

// add pending toolCall(s)
toolProgressMessages = aiMessage.tool_calls.map(toolCall => new ToolProgressMessage(toolCall)) || [];
session.setMessages([...messages, ...toolProgressMessages]);
if (aiMessage)
{
setMessageIsStreaming(aiMessage, false);
messages.push(aiMessage);
}

await session.flush();
if (!aiMessage?.tool_calls?.length)
{
return messages;
}

return work(props);
// add pending toolCall(s)
toolProgressMessages = aiMessage.tool_calls.map(toolCall => new ToolProgressMessage(toolCall)) || [];
session.setMessages([...messages, ...toolProgressMessages]);
}
}

async function workTools(props: Pick<WorkProps, "session" | "chatService" | "signal">)
Expand Down