open-source/cursor-byok
1
0
Fork 0
mirror of https://wget.la/https://github.com/leookun/cursor-byok synced 2026-08-20 21:17:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(forwarder): reset bidi append seq when Cursor reuses request_id

Browse Source 
Cursor may reuse the same request_id for a later turn and restart
append_seqno from 1. Accept seq=1 after progress as a sequence restart
when idle so tool results are not discarded as stale forever.
This commit is contained in:
lixingcheng
2026-07-27 18:09:09 +08:00
parent 9e05739969
commit 3a3be0c9e9
2 changed files with 195 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/backend/forwarder/append_seq.go
+28 -3
View File
@@ -2,6 +2,7 @@ package forwarder
import (
"context"
"log"
"strings"
"sync"
"time"
@@ -37,8 +38,9 @@ func (tracker *appendSequenceTracker) Acquire(ctx context.Context, requestID str
if tracker == nil || strings.TrimSpace(requestID) == "" || appendSeq <= 0 {
return appendSequenceTicket{}, false, nil
}
state := tracker.state(strings.TrimSpace(requestID))
stale, err := state.acquire(ctx, appendSeq)
requestID = strings.TrimSpace(requestID)
state := tracker.state(requestID)
stale, err := state.acquire(ctx, requestID, appendSeq)
if err != nil || stale {
return appendSequenceTicket{}, stale, err
}
@@ -72,7 +74,7 @@ func (tracker *appendSequenceTracker) state(requestID string) *appendSequenceSta
return state
}
func (state *appendSequenceState) acquire(ctx context.Context, appendSeq int64) (bool, error) {
func (state *appendSequenceState) acquire(ctx context.Context, requestID string, appendSeq int64) (bool, error) {
for {
state.mu.Lock()
now := time.Now().UTC()
@@ -83,6 +85,29 @@ func (state *appendSequenceState) acquire(ctx context.Context, appendSeq int64)
state.ready = make(chan struct{})
}
state.updatedAt = now
// Cursor may reuse the same request_id for a later turn and restart
// append_seqno from 1. Accept that as a sequence restart when idle so
// tool results are not discarded as stale forever.
if appendSeq == 1 && state.next > 1 {
if state.processing {
ready := state.ready
state.mu.Unlock()
select {
case <-ctx.Done():
return false, ctx.Err()
case <-ready:
}
continue
}
prevNext := state.next
state.next = 1
state.processing = true
state.mu.Unlock()
log.Printf("forwarder reset append sequence request_id=%s previous_next=%d append_seqno=1", requestID, prevNext)
return false, nil
}
switch {
case appendSeq < state.next:
state.mu.Unlock()