Repository navigation
Merge main into be-11470-recording-tooling-ts (unblock 16782) - #17410
christian-byrne wants to merge 1 commit into
Conversation
…e-label-fix # Conflicts: # browser_tests/README.md # browser_tests/fixtures/data/agent/agentConversation.test.ts # browser_tests/fixtures/data/agent/agentConversation.ts
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: ASSERTIVE Plan: Team Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Comment |
🎨 Storybook: ✅ Built — View Storybook🎭 Playwright: ✅ 1959 passed, 0 failed · 1 flaky📊 Browser Reports
|
Codecov Report❌ Patch coverage is
@@ Coverage Diff @@
## nathaniel/be-11470-recording-tooling-ts #17410 +/- ##
===========================================================================
- Coverage 83.42% 83.07% -0.35%
===========================================================================
Files 2090 2094 +4
Lines 121459 122555 +1096
Branches 30769 31802 +1033
===========================================================================
+ Hits 101323 101813 +490
- Misses 19957 20563 +606
Partials 179 179
Flags with carried forward coverage won't be shown. Click here to find out more.
... and 43 files with indirect coverage changes 🚀 New features to boost your workflow:
|
Merges
origin/maininto the head branch of #16782 so that PR becomes mergeable after #16764 landed. No functional change beyond conflict resolution.Full context for agent readers
Why: #16782 was stacked on #16764. After 16764 merged and 16782 was retargeted to
main, three files conflicted as add/add because both branches introduced them independently:browser_tests/README.mdbrowser_tests/fixtures/data/agent/agentConversation.tsbrowser_tests/fixtures/data/agent/agentConversation.test.tsResolution: kept the 16782 versions (
--ours) because they are the superset that 16764's copy was derived from; the label-drift fix in this branch is preserved. Same helper-PR pattern as #17391 (merged), used because pushing directly to anathaniel/*branch is out of scope for this lane.Verification on the merge commit:
pnpm vitest run browser_tests/fixtures/data/agentpasses (2 files, 76 tests)pnpm typecheckpassesAfter this merges into
nathaniel/be-11470-recording-tooling-ts, 16782 should show MERGEABLE and can be approved and enqueued.