Skip to content

fix: flaky auto-approve #62

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
merged 1 commit into from
Oct 28, 2025
Merged

fix: flaky auto-approve #62

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
26 changes: 8 additions & 18 deletions packages/blink/src/react/use-dev-mode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,6 @@ export interface UseDevMode {
*/
export default function useDevMode(options: UseDevModeOptions): UseDevMode {
const { directory } = options;

// Approval handling state (declared early so it can be used in callbacks)
const [approvalHandled, setApprovalHandled] = useState<string | undefined>();
const [autoApprove, setAutoApprove] = useState(false);

// Mode state
Expand All @@ -141,8 +138,6 @@ export default function useDevMode(options: UseDevModeOptions): UseDevMode {
(newMode: DevMode) => {
setModeState(newMode);
options.onModeChange?.(newMode);
// Clear approval state when switching modes
setApprovalHandled(undefined);
},
[options.onModeChange]
);
Expand Down Expand Up @@ -504,11 +499,6 @@ export default function useDevMode(options: UseDevModeOptions): UseDevMode {
if (!lastMessage) {
return;
}
// Don't show approval prompt if we've already handled this message
if (approvalHandled === lastMessage.id) {
return;
}

const parts = lastMessage.parts.filter(isToolOrDynamicToolUIPart);
if (parts.length === 0) {
return;
Expand All @@ -521,8 +511,9 @@ export default function useDevMode(options: UseDevModeOptions): UseDevMode {
return lastMessage as UIMessage;
}
return undefined;
}, [chat.messages, approvalHandled]);
}, [chat.messages]);

const approvalHandledRef = useRef<string | undefined>(undefined);
const handleApproval = useCallback(
async (approved: boolean, enableAutoApprove?: boolean) => {
if (!needsApproval) return;
Expand All @@ -532,9 +523,6 @@ export default function useDevMode(options: UseDevModeOptions): UseDevMode {
setAutoApprove(true);
}

// Mark this message as handled immediately
setApprovalHandled(needsApproval.id);

const messages = chat.messages;
if (messages.length === 0) {
return;
Expand All @@ -549,6 +537,12 @@ export default function useDevMode(options: UseDevModeOptions): UseDevMode {
if (!Array.isArray(lastMsg.parts)) {
return;
}
if (approvalHandledRef.current === lastMsg.id) {
return;
}
// CRITICAL: all code before this point must be synchronous.
// Otherwise, the approval may be handled multiple times.
approvalHandledRef.current = lastMsg.id;
// Update all pending approval outputs
const updatedParts = lastMsg.parts.map((part: any) => {
if (
Expand Down Expand Up @@ -589,14 +583,10 @@ export default function useDevMode(options: UseDevModeOptions): UseDevMode {
const id = crypto.randomUUID();
setChatId(id);
setChatIds((prev) => [...prev, id]);
// Clear approval state when switching chats
setApprovalHandled(undefined);
}, []);

const switchChat = useCallback((id: ID) => {
setChatId(id);
// Clear approval state when switching chats
setApprovalHandled(undefined);
}, []);

// Build approval object if needed
Expand Down