merge: resolve conflicts with main#37
Merged
flo-bit merged 16 commits intoMay 8, 2026
Merged
Conversation
Version Packages
Version Packages
Version Packages
Version Packages
Main added record-filter, identity-events, follow-feed, and lex-gen-fix features in `packages/contrail/src/core/*` that PR flo-bit#30 had reorganized into the new package split. Each conflict resolved by: 1. Keeping PR flo-bit#30's re-export shims in `packages/contrail/src/core/*` (these files now `export * from "@atmo-dev/contrail-appview"`) 2. Porting main's additions to the corresponding files in `packages/contrail-appview/src/core/*`, which is the new home of the actual implementation. Files re-shimmed: - backfill.ts, db/records.ts, db/schema.ts, identity.ts, jetstream.ts, persistent.ts, router/feed.ts, types.ts Ports landed in contrail-appview/src/core (or contrail-base where types and identity helpers actually live): - backfill.ts, db/records.ts, db/schema.ts, jetstream.ts, persistent.ts, router/feed.ts (+1.0K lines from main) - constellation.ts (new 181-line module) - contrail-base/src/types.ts: FeedTargetConfig, ConstellationConfig, buildFeedTargetCaps, normalizeFeedTarget, feedTargetMaxItems, CollectionConfig.{timeField, subjectField, recordFilter}, and resolveConfig defaulting `discover: false` for `app.bsky.*` - contrail-base/src/identity.ts: applyIdentityEvent (handle change handler) Test mock for `persistent.test.ts` updated to mock `@atmo-dev/contrail-base` (post-split home of identity helpers) and include both `refreshStaleIdentities` and `applyIdentityEvent`. Test status post-merge: 314 passed, 7 failed in `packages/contrail/tests/search.test.ts` — these 7 failures pre-exist on plain `origin/main` and are unrelated to the merge. No behavior changes intended beyond what main and PR flo-bit#30 already deliver.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolves the merge conflict between
feat/another-big-refactorandmainso PR #30 can land cleanly. No behavior changes intended.Strategy
Main added features (record filter, identity events, follow feed fixes, lex-gen fix, new
constellation.ts) inpackages/contrail/src/core/*— files PR #30 had collapsed into re-export shims. For each conflict:packages/contrail/src/core/*.ts(one-linerexport * from "@atmo-dev/contrail-appview").packages/contrail-appview/src/core/*(orpackages/contrail-base/src/*fortypes.tsandidentity.ts, where they actually live post-split).Notable resolutions
packages/contrail-base/src/types.ts— applied main's additions (FeedTargetConfig, ConstellationConfig, buildFeedTargetCaps and friends, CollectionConfig.{timeField, subjectField, recordFilter}, app.bsky.* defaultdiscover: false, auto-add follow collection from feeds) on top of PR another big refactor #30's two refactor edits (thecommunity?: unknowndeclaration-merging change and thespaces?.authorityrequirement).packages/contrail-base/src/identity.ts— addedapplyIdentityEventfrom main (was originally onpackages/contrail/src/core/identity.ts).packages/contrail/tests/persistent.test.ts— kept PR another big refactor #30'svi.mock("@atmo-dev/contrail-base", ...)target (post-split home of identity helpers), added main'sapplyIdentityEventMockso existing test cases at lines 374/416 continue to work, included bothrefreshStaleIdentitiesandapplyIdentityEventin the mock.packages/contrail/src/core/constellation.ts— became a new re-export shim pointing at@atmo-dev/contrail-appview; the actual 181-line implementation copied topackages/contrail-appview/src/core/constellation.ts.Test status
contrail-base,contrail-appview,contrail-authority,contrail-record-host,contrail-community,lexicons: all green.contrail: 314 passed, 7 failed intests/search.test.ts. These 7 failures pre-exist on plainorigin/mainand are unrelated to the merge — verified by checking outorigin/mainand observing the same failures.Test plan
types.tsinterleaving).search.test.tscases that fail on main).persistent.test.ts, happy to adjust.