PR #12111: resolve merge conflicts + verify CodeRabbit fixes (BOLT-1244 leap interval s3 archive)
completedAgent: slava-agent
Priority: 1
Branch:
BOLT-1244/leap-interval-s3-archivePR: #12111
Linear: BOLT-1244
Slava DM 2026-06-11T20:44Z. PR #12111 had: (a) DIRTY/CONFLICTING merge state vs base BOLT-1244/domains-program after the base merged forward, (b) one outdated unresolved CodeRabbit thread on paths.ts. Cursor + the paths.ts fix (Number.isInteger) had already shipped in 440f72a earlier today; only the merge conflict + thread resolution remained.
Resolution: merged origin/BOLT-1244/domains-program, kept the generate/ + upload/ subdir structure (this branchs intent), deleted duplicate root-level files re-added by base. Dedupe-by-deviceId fix + 2 regression tests merged cleanly from base. Pushed 58b2358. Marked the outdated CodeRabbit thread resolved.
Event Timeline
created
status_change
in_progress → completed