[상류 3단계] 기존 #4596에 cancelled-resume queue 복원 좁은 보완 #206
Reference in New Issue
Block a user
Delete Branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
원 요구·승인
소유자 최신 실행 승인(sent/codex_upstream_execute_approved_sequence_1029.md) 3단계. 승인 제안 feature-pr-map 236·551행: 좁은 cancelled-resume queue 복원은 기존 queue-reliability PR #4596에 넣는다(일반 recovery를 #4596·#4603에 붙이지 않음, native-resume 전체 재제출 0). 이 task가 그 단일 source writer.
입력
kdlbs/kandev#4596 'fix(orchestrator): drain queued messages left on idle sessions' OPEN, 공개 head 4c4e4694d954, fork branch claude/pr-idle-queue-drain. 원 source: feature-pr-map 38행 L1의 cancelled queued resume commit(821cf6426·6ca991282·6b3b31608·da7cbaf22 중 cancellation 몫), git store D:/260720_Ai_Workspace_Tools/kandev-upstream-native-20261015/.git(운영 사본 kandev-local-main-20261022 codex/production f742d87b14cf). #4596의 legacy walkthrough·docs evaluation 실패 2건은 이전 처분 그대로(이 단위에서 재시도 0).
할 일
시작 조건(선행 대기)
orchestrator queue/task_operations 공통 파일을 3단계 guard 단위(e80cef65 materialized profile guard, 6649f0f8 route-action queue guard)와 동시에 쓰지 않도록, 8e가 앞 단위 변경 경로를 대조한 뒤 대기 칸으로 옮긴다.
8e receiving acceptance: ACCEPT the narrow cancelled-resume restore addition for the existing #4596 (task 85ddca62-af90-4a57-917c-3feac9c4eafa, single writer). 8e read-only checks: worktree kandev-upstream-s3-4_xllsrzl6 branch kd/up4596-cancelled-resume HEAD 2499fd064abea419b283b6dfbe63375f3d64d0c7, clean, descendant of the public #4596 head 4c4e4694d954 (non-force FF of claude/pr-idle-queue-drain possible), 3 commits, 5 files: event_handlers_agent.go finishQueuedMessageExecution ErrResumeAttemptCancelled restore branch (the existing early guard if deliveryAttempted && err != nil excludes post-attempt cancellation), tests only in existing event_handlers_queue_cancellation_test.go and queue_dispatch_recovery_test.go (no new test file), resume-prompt-queue requirements/design REQ-003. Shutdown Stop-race kept as the source-documented boundary: the leftover claim is parked by startup reconciliation (existing TestUnknownQueueDispatchOutcomeParksWithRecoveryBlock) and restored by explicit session recovery (TestCancelledResumeLeftoverClaimRestoresAfterSessionRecovery), so no message loss; documented in AC 003.1 and design. validateCoverage on the full PR diff covered (source). Formal RV history: RV1-RV3 findings resolved (RV3 was a context-gap false positive; 8e confirmed the guard in code), final RV4 FORMAL-rv-packet.md-1793274977973115700-20253-mid-1 (CALL-20261029-8a1ff835ef01) completed APPROVE findings 0 (8e read). Excluded: stream/client lease and agentctl URL commits, other PRs. No push/comment. Publication: 93->5d non-force FF of the same #4596 to 2499fd064abe.
#4596 cancelled-resume narrow port (upstream prep) complete and reviewed. reviewed head 2499fd064abea419b283b6dfbe63375f3d64d0c7, base 4c4e4694d954f049ebf72e11eda7d6e3cb9e822e (#4596 public head), branch kd/up4596-cancelled-resume, 3 commits (author dreampiler). Change: finishQueuedMessageExecution ErrResumeAttemptCancelled restore branch; focused cases in existing test files (no new permanent test file); resume-prompt-queue REQ-TASKS-RESUME-PROMPT-QUEUE-003. Formal RV APPROVE CALL-20261029-8a1ff835ef01 (findings 0, reviewer gpt-6-luna, ref FORMAL-rv-packet.md-1793274977973115700-20253-mid-1@1). pr-docs validateCoverage over the full PR diff: ok/covered/errors[]. Local commits only; no push/PR/comment. Handed to publication owner task 93c6b4d0-8a64-47d2-b006-4a9067d156db (primary session d6347506, queued status). Preparation branch preserved; publication to the same #4596 branch claude/pr-idle-queue-drain is pending that owner.
8e publication acceptance: the cancelled-resume restore addition is published on the existing kdlbs/kandev#4596 by sole publisher 5d as a non-force fast-forward (live head 4c4e4694d954 checked before push). 8e gh readback: OPEN, MERGEABLE, head 2499fd064abea419b283b6dfbe63375f3d64d0c7 = reviewed head accepted in artifact-note:20261029T115807842926Z, unresolved review threads 0. 93 readback: base main, PR body now describes the ErrResumeAttemptCancelled restore and the Stop-race boundary, 6/6 inline threads resolved; exact-head check-runs 13 (6 queued, 7 completed/skipped, 0 failed); combined status had no statuses yet, so the new-head PR documentation coverage result was not yet reported. Not a whole-CI-green or docs-coverage-pass claim. Maintainer review and merge remain external.
인계 루프가 닫혔습니다.
93c6b4d0가 인계 접수 확인: #4596 갱신 요청과 reviewed head2499fd064ab를 sole publisher 5d에 전달했고, source 쪽 추가 push·중복 전달 불필요, 공개 head·check readback 후 결과 인수.2499fd064ab, base4c4e4694d954, 준비 branchkd/up4596-cancelled-resume보존, 코드 변경 0, 정식 RV APPROVE,flow.report-progress기록 유지.