Fimeg/letta-code
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix(plan-mode): dedupe bypass auto-approvals by tool_call_id (#1426)

Browse Source 
Co-authored-by: Letta Code <noreply@letta.com>
This commit is contained in:
jnjpng
2026-03-17 18:40:53 -07:00
committed by GitHub
parent a405a59520
commit aee9e5195b
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/cli/App.tsx
View File

@@ -1177,6 +1177,8 @@ export default function App({
| { type: "deny"; approval: ApprovalRequest; reason: string } | { type: "deny"; approval: ApprovalRequest; reason: string }
> >
>([]); >([]);
const lastAutoApprovedEnterPlanToolCallIdRef = useRef<string | null>(null);
const lastAutoHandledExitPlanToolCallIdRef = useRef<string | null>(null);
const [isExecutingTool, setIsExecutingTool] = useState(false); const [isExecutingTool, setIsExecutingTool] = useState(false);
const [queuedApprovalResults, setQueuedApprovalResults] = useState< const [queuedApprovalResults, setQueuedApprovalResults] = useState<
ApprovalResult[] | null ApprovalResult[] | null
@@ -12697,6 +12699,12 @@ ${SYSTEM_REMINDER_CLOSE}
const currentIndex = approvalResults.length; const currentIndex = approvalResults.length;
const approval = pendingApprovals[currentIndex]; const approval = pendingApprovals[currentIndex];
if (approval?.toolName === "ExitPlanMode") { if (approval?.toolName === "ExitPlanMode") {
if (
lastAutoHandledExitPlanToolCallIdRef.current === approval.toolCallId
) {
return;
}
const mode = permissionMode.getMode(); const mode = permissionMode.getMode();
const activePlanPath = permissionMode.getPlanFilePath(); const activePlanPath = permissionMode.getPlanFilePath();
const fallbackPlanPath = lastPlanFilePathRef.current; const fallbackPlanPath = lastPlanFilePathRef.current;
@@ -12706,6 +12714,7 @@ ${SYSTEM_REMINDER_CLOSE}
if (mode === "bypassPermissions") { if (mode === "bypassPermissions") {
if (hasUsablePlan) { if (hasUsablePlan) {
// YOLO mode with a plan file — auto-approve ExitPlanMode. // YOLO mode with a plan file — auto-approve ExitPlanMode.
lastAutoHandledExitPlanToolCallIdRef.current = approval.toolCallId;
handlePlanApprove(); handlePlanApprove();
return; return;
} }
@@ -12734,6 +12743,7 @@ ${SYSTEM_REMINDER_CLOSE}
buffersRef.current.order.push(statusId); buffersRef.current.order.push(statusId);
// Queue denial to send with next message (same pattern as handleCancelApprovals) // Queue denial to send with next message (same pattern as handleCancelApprovals)
lastAutoHandledExitPlanToolCallIdRef.current = approval.toolCallId;
const denialResults = [ const denialResults = [
{ {
type: "approval" as const, type: "approval" as const,
@@ -12764,6 +12774,7 @@ ${SYSTEM_REMINDER_CLOSE}
// Mode is plan: require an existing plan file (active or fallback) // Mode is plan: require an existing plan file (active or fallback)
if (!hasUsablePlan) { if (!hasUsablePlan) {
lastAutoHandledExitPlanToolCallIdRef.current = approval.toolCallId;
const planFilePath = activePlanPath ?? fallbackPlanPath; const planFilePath = activePlanPath ?? fallbackPlanPath;
const plansDir = join(homedir(), ".letta", "plans"); const plansDir = join(homedir(), ".letta", "plans");
handlePlanKeepPlanning( handlePlanKeepPlanning(
@@ -12959,6 +12970,12 @@ If using apply_patch, use this exact relative patch path: ${applyPatchRelativePa
const approval = pendingApprovals[currentIndex]; const approval = pendingApprovals[currentIndex];
if (approval?.toolName === "EnterPlanMode") { if (approval?.toolName === "EnterPlanMode") {
if (permissionMode.getMode() === "bypassPermissions") { if (permissionMode.getMode() === "bypassPermissions") {
if (
lastAutoApprovedEnterPlanToolCallIdRef.current === approval.toolCallId
) {
return;
}
lastAutoApprovedEnterPlanToolCallIdRef.current = approval.toolCallId;
handleEnterPlanModeApprove(true); handleEnterPlanModeApprove(true);
} }
} }