Skip to content

Fix/skip approval #3616

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

Fix/skip approval #3616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e40d06
fix: add promptForToolApproval to prevent tool hang in mothership chat
Mar 17, 2026
8bfe39f
Merge remote-tracking branch 'origin/staging' into fix/skip-approval
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
2 changes: 2 additions & 0 deletions apps/sim/app/api/copilot/chat/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ export async function POST(req: NextRequest) {
goRoute: '/api/copilot',
autoExecuteTools: true,
interactive: true,
promptForToolApproval: true,
},
})

Expand All @@ -315,6 +316,7 @@ export async function POST(req: NextRequest) {
goRoute: '/api/copilot',
autoExecuteTools: true,
interactive: true,
promptForToolApproval: true,
})

const responseData = {
Expand Down
1 change: 1 addition & 0 deletions apps/sim/app/api/mothership/chat/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ export async function POST(req: NextRequest) {
goRoute: '/api/mothership',
autoExecuteTools: true,
interactive: true,
promptForToolApproval: false,
onComplete: async (result: OrchestratorResult) => {
if (!actualChatId) return

Expand Down
4 changes: 2 additions & 2 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 @@ -320,7 +320,7 @@ export const sseHandlers: Record<string, SSEHandler> = {
return
}

if (requiresConfirmation) {
if (requiresConfirmation && options.promptForToolApproval) {
const decision = await waitForToolDecision(
toolCallId,
options.timeout || STREAM_TIMEOUT_MS,
Expand Down Expand Up @@ -569,7 +569,7 @@ export const subAgentHandlers: Record<string, SSEHandler> = {
return
}

if (requiresConfirmation) {
if (requiresConfirmation && options.promptForToolApproval) {
const decision = await waitForToolDecision(
toolCallId,
options.timeout || STREAM_TIMEOUT_MS,
Expand Down
7 changes: 7 additions & 0 deletions apps/sim/lib/copilot/orchestrator/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,13 @@ export interface OrchestratorOptions {
onError?: (error: Error) => void | Promise<void>
abortSignal?: AbortSignal
interactive?: boolean
/**
* When true, tools with `requiresConfirmation` will block until the client
* explicitly approves or rejects. When false (e.g. Mothership chat), those
* tools are auto-executed without waiting for user approval.
* Defaults to false.
*/
promptForToolApproval?: boolean
}

export interface OrchestratorResult {
Expand Down
Loading