Skip to content

fix(mothership): fix tool call scheduling #3635

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
Sg312 merged 2 commits into from
Mar 17, 2026
Merged

fix(mothership): fix tool call scheduling #3635

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23e9668
Fix mothership tool scheduling
Sg312 Mar 17, 2026
d90de25
Fix
Sg312 Mar 17, 2026
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
47 changes: 28 additions & 19 deletions apps/sim/lib/copilot/orchestrator/sse/handlers/handlers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ export const sseHandlers: Record<string, SSEHandler> = {
return
}

if (!isToolAvailableOnSimSide(toolName)) {
if (!isToolAvailableOnSimSide(toolName) && !clientExecutable) {
return
}

Expand Down Expand Up @@ -396,16 +396,21 @@ export const sseHandlers: Record<string, SSEHandler> = {
return
}

// Auto-allowed client-executable tool: client runs it, we wait for completion.
// Client-executable tool: execute server-side if available, otherwise
// delegate to the client (React UI) and wait for completion.
if (clientExecutable) {
toolCall.status = 'executing'
const completion = await waitForToolCompletion(
toolCallId,
options.timeout || STREAM_TIMEOUT_MS,
options.abortSignal
)
handleClientCompletion(toolCall, toolCallId, completion)
await emitSyntheticToolResult(toolCallId, toolCall.name, completion, options)
if (isToolAvailableOnSimSide(toolName)) {
fireToolExecution()
} else {
toolCall.status = 'executing'
const completion = await waitForToolCompletion(
toolCallId,
options.timeout || STREAM_TIMEOUT_MS,
options.abortSignal
)
handleClientCompletion(toolCall, toolCallId, completion)
await emitSyntheticToolResult(toolCallId, toolCall.name, completion, options)
}
return
}

Expand Down Expand Up @@ -548,7 +553,7 @@ export const subAgentHandlers: Record<string, SSEHandler> = {
return
}

if (!isToolAvailableOnSimSide(toolName)) {
if (!isToolAvailableOnSimSide(toolName) && !clientExecutable) {
return
}

Expand Down Expand Up @@ -643,14 +648,18 @@ export const subAgentHandlers: Record<string, SSEHandler> = {
}

if (clientExecutable) {
toolCall.status = 'executing'
const completion = await waitForToolCompletion(
toolCallId,
options.timeout || STREAM_TIMEOUT_MS,
options.abortSignal
)
handleClientCompletion(toolCall, toolCallId, completion)
await emitSyntheticToolResult(toolCallId, toolCall.name, completion, options)
if (isToolAvailableOnSimSide(toolName)) {
fireToolExecution()
} else {
toolCall.status = 'executing'
const completion = await waitForToolCompletion(
toolCallId,
options.timeout || STREAM_TIMEOUT_MS,
options.abortSignal
)
handleClientCompletion(toolCall, toolCallId, completion)
await emitSyntheticToolResult(toolCallId, toolCall.name, completion, options)
}
return
}

Expand Down
Loading