Skip to content

fix(chat-bridge): add updatedInput to canUseTool responses to satisfy… #17

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

Open
eduardomrj wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −8
Open

fix(chat-bridge): add updatedInput to canUseTool responses to satisfy… #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions dashboard/terminal-server/src/chat-bridge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ class ChatBridge {
}
return new Promise((resolve) => {
if (!currentSession.pendingApprovals) currentSession.pendingApprovals = new Map();
currentSession.pendingApprovals.set(requestId, resolve);
currentSession.pendingApprovals.set(requestId, { resolve, toolInput: input });
if (onMessage) {
onMessage({
type: 'permission_request',
Expand All @@ -283,7 +283,7 @@ class ChatBridge {

queryOptions.canUseTool = async (toolName, input, sdkOptions) => {
if (readTrustMode() || AUTO_APPROVE.has(toolName)) {
return { behavior: 'allow' };
return { behavior: 'allow', updatedInput: input ?? {} };
}
const requestId = sdkOptions.toolUseID || `req-${Date.now()}-${Math.random().toString(36).slice(2)}`;
return requestApprovalFromUser(toolName, input, requestId, null);
Expand Down Expand Up @@ -439,8 +439,8 @@ class ChatBridge {
session.active = false;
// Deny all pending approval requests so awaiting canUseTool promises resolve.
if (session.pendingApprovals && session.pendingApprovals.size > 0) {
for (const resolve of session.pendingApprovals.values()) {
resolve({ behavior: 'deny', message: 'Session stopped by user.' });
for (const entry of session.pendingApprovals.values()) {
entry.resolve({ behavior: 'deny', message: 'Session stopped by user.' });
}
session.pendingApprovals.clear();
}
Expand All @@ -458,12 +458,12 @@ class ChatBridge {
respondToApproval(sessionId, requestId, approved) {
const session = this.sessions.get(sessionId);
if (!session?.pendingApprovals) return false;
const resolve = session.pendingApprovals.get(requestId);
if (!resolve) return false;
const entry = session.pendingApprovals.get(requestId);
if (!entry) return false;
session.pendingApprovals.delete(requestId);
resolve(
entry.resolve(
approved
? { behavior: 'allow' }
? { behavior: 'allow', updatedInput: entry.toolInput ?? {} }
: { behavior: 'deny', message: 'User denied this tool use.' }
);
return true;
Expand Down