refactor(messaging): migrate conflict detection to manifest-plan architecture (phase 4a, #4392) - #4908

Merged

cv merged 31 commits into

mainfrom

feat/phase-4a-messaging-conflict-plan-driven

Jun 8, 2026

Commits on Jun 7, 2026

feat(onboard): persist messaging plan in session for resume

sandl99
and
claude
committed
3e41d49
refactor(onboard): move messaging plan env helpers to messaging-channel-setup

sandl99
and
claude
committed
461c399
fix(onboard): add plan identity guard and test coverage for resume plan persistence

sandl99
and
claude
committed
9a4ed8e
fix(onboard): prefer env-staged plan over session plan on non-interactive resume

sandl99
and
claude
committed
2d05201
refactor(onboard): establish messagingPlan as session source of truth

sandl99
and
claude
committed
673d441
refactor(messaging): migrate conflict detection to manifest-plan architecture (phase 4a)

sandl99
and
claude
committed
6913199
fix(messaging): address CodeRabbit review on conflict detection

sandl99
and
claude
committed
9e57fc0
fix(messaging): address Advisor review findings on conflict detection

sandl99
and
claude
committed
aa028bd
Merge remote-tracking branch 'origin/main' into feat/phase-4a-messaging-conflict-plan-driven
sandl99
committed
b294a4f
fix(messaging): decouple channel registry from conflict-detection core and populate credentialHash in plan bindings

sandl99
and
claude
committed
d12db3c
Merge branch 'main' into feat/phase-4a-messaging-conflict-plan-driven
sandl99
authored
50bbc4e
fix(messaging): address PR Review Advisor findings on conflict detection

sandl99
and
claude
committed
b2117c8
fix(messaging): validate env plan sandbox identity and update stale comments

sandl99
and
claude
committed
b545d0a
fix(messaging): restore legacy hash fallback and fix disabled-channel test fixtures

sandl99
and
claude
committed
7bee701
fix(messaging): scope legacy hashes by channel and intersect plan bindings with active channels

sandl99
and
claude
committed
40142b9
fix(messaging): use manifest keys for multi-credential conflict comparison and add no-plan fallback

sandl99
and
claude
committed
50633fe
fix(messaging): close plan coverage gap and migrate add-channel to manifest-driven hashing

sandl99
and
claude
committed
2e6f1e3
refactor(messaging): remove providerCredentialHashes from conflict detection

sandl99
and
claude
committed
5e3977a
refactor(messaging): remove providerCredentialHashes from all write paths

sandl99
and
claude
committed
0fe3685
chore(ci): lower test size budget for channels-add-preset and onboard-messaging

sandl99
and
claude
committed
a2c6510
merge: resolve test-file-size-budget conflict with origin/main

sandl99
and
claude
committed
08a563d

Commits on Jun 8, 2026

test(messaging): update token rotation plan hash check
sandl99
committed
34e9762
Merge branch 'main' into feat/phase-4a-messaging-conflict-plan-driven
sandl99
authored
ce76283
refactor(messaging): remove conflict adapter
sandl99
committed
1d66456
Merge branch 'main' into feat/phase-4a-messaging-conflict-plan-driven
sandl99
authored
3634df4
fix(messaging): fail closed on channel conflict errors
sandl99
committed
50f459a
refactor(messaging): split conflict detection modules
sandl99
committed
b2031d9
fix(messaging): keep legacy backfill pre-plan only
sandl99
committed
fab8c69
Merge branch 'main' into feat/phase-4a-messaging-conflict-plan-driven
sandl99
authored
be2bbe0
fix(messaging): ignore credentialless conflict comparisons
San Dang
committed
bd847fc
refactor(messaging): split conflict detection modules
sandl99
committed
f5839b2

Navigation Menu

Uh oh!

refactor(messaging): migrate conflict detection to manifest-plan architecture (phase 4a, #4392) - #4908

refactor(messaging): migrate conflict detection to manifest-plan architecture (phase 4a, #4392)#4908
cv merged 31 commits into
mainfrom
feat/phase-4a-messaging-conflict-plan-driven

Commits on Jun 7, 2026

feat(onboard): persist messaging plan in session for resume

refactor(onboard): move messaging plan env helpers to messaging-channel-setup

fix(onboard): add plan identity guard and test coverage for resume plan persistence

fix(onboard): prefer env-staged plan over session plan on non-interactive resume

refactor(onboard): establish messagingPlan as session source of truth

refactor(messaging): migrate conflict detection to manifest-plan architecture (phase 4a)

fix(messaging): address CodeRabbit review on conflict detection

fix(messaging): address Advisor review findings on conflict detection

Merge remote-tracking branch 'origin/main' into feat/phase-4a-messaging-conflict-plan-driven

fix(messaging): decouple channel registry from conflict-detection core and populate credentialHash in plan bindings

Merge branch 'main' into feat/phase-4a-messaging-conflict-plan-driven

fix(messaging): address PR Review Advisor findings on conflict detection

fix(messaging): validate env plan sandbox identity and update stale comments

fix(messaging): restore legacy hash fallback and fix disabled-channel test fixtures

fix(messaging): scope legacy hashes by channel and intersect plan bindings with active channels

fix(messaging): use manifest keys for multi-credential conflict comparison and add no-plan fallback

fix(messaging): close plan coverage gap and migrate add-channel to manifest-driven hashing

refactor(messaging): remove providerCredentialHashes from conflict detection

refactor(messaging): remove providerCredentialHashes from all write paths

chore(ci): lower test size budget for channels-add-preset and onboard-messaging

merge: resolve test-file-size-budget conflict with origin/main

Commits on Jun 8, 2026

test(messaging): update token rotation plan hash check

Merge branch 'main' into feat/phase-4a-messaging-conflict-plan-driven

refactor(messaging): remove conflict adapter

Merge branch 'main' into feat/phase-4a-messaging-conflict-plan-driven

fix(messaging): fail closed on channel conflict errors

refactor(messaging): split conflict detection modules

fix(messaging): keep legacy backfill pre-plan only

Merge branch 'main' into feat/phase-4a-messaging-conflict-plan-driven

fix(messaging): ignore credentialless conflict comparisons

refactor(messaging): split conflict detection modules