mirror of
https://github.com/stablyai/orca.git
synced 2026-09-28 16:02:45 +00:00
Jinwoo-H
4572fddaa6
Three conflicts, all structural:
- `adapters/mounted-operation-modules.ts`: union of both sides' entries. #20705
added `new-workspace` and `worktree-catalog`; this branch adds
`transport-status`, `relay-credential` and `pairing-journal`. The two relay
entries move into alphabetical position so the register stays sorted.
- `pilot-scenarios.json`: union of both sides' scenarios, 109 shared + 21 from
main + 19 from here = 149. Neither side edited or removed a scenario and no id
collides, so the merge is additive. Both sides already pinned baseline
c6a7216984.
- `unvalidated-rpc-request-port-inventory.ts`: this branch's `src/transport/`
holdouts, which record migrations main has not seen, plus main's deletion of
the `src/worktree/` section, whose three files #20705 migrated.
Main's 47 new goldens arrive unchanged and fail `recorderSha256` here, for the
reason already ruled structural for the other 208: this branch adds two files to
the recorder engine. The next commit re-records them.
Claude-Session: https://claude.ai/code/session_01JNnE9qzUZMMnqpZWCqM3nb