Repository integration
Integration boundary
The integration target is main. Every local branch and fetched origin branch is audited at its committed head. Existing uncommitted files stay in their original worktrees. An isolated, clean checkout prepares the integration. Branch deletion is a separate operation.
Existing implementation
The current main tree contains many branch changes through cherry-picked or later rewritten commits. Patch-equivalent branches can have different commit IDs. The origin main history is independent and predates the local snapshot; its tree must be compared against that snapshot before connecting ancestry. The Agent and Context refactor and the official Anthropic API requirement remain authoritative.
Merge decisions
An ancestor already satisfies containment. For duplicate or superseded changes, retain the current implementation and record the branch ancestry only after comparing its unique patches. Apply genuinely new changes through normal content merges. Preserve newer implementations when old branches reference removed APIs. Dependency updates are resolved together into one lockfile. A blanket remote overwrite or blanket acceptance of historical files is rejected.
Verification and failure handling
The branch inventory records exact heads, remote heads, containment, patch comparisons, reviews and remaining checks in a private delivery ledger. Verify every inventory head is an ancestor of the final main commit. Run repository contracts, affected public checks, dependency lock validation, Web tests and documentation checks on that combined head. Existing full-suite failures remain explicitly incomplete and do not become passing evidence. Re-fetch origin before upload and require a normal fast-forward push. Conflicts or failed writes preserve the candidate and original refs.
Delivery
Publish the exact reviewed integration head to origin/main. Verify the remote SHA independently, advance local main without losing untracked files, and refresh the one default installed App from the clean integration checkout. Use the default profile and port 18100 for App acceptance.
Implementation status
Branch inventory and integration are in progress. Final ancestry, review, verification, remote write and App acceptance are recorded separately in the delivery ledger. No full-framework health claim is made.