mirror of
https://github.com/stablyai/orca.git
synced 2026-09-25 08:02:31 +00:00
Brennan Benson
55327fe893
#19850 was retargeted to main after #19849 landed as a SQUASH, so this branch
held #19849's original commits while main held the squashed equivalent - the
same content under different SHAs, which git reported as dirty.
Five files conflicted add/add, all of them files this PR also edits. Neither
side was takeable wholesale: theirs would have discarded this PR's work, ours
would have discarded anything main gained. Verified first that main's blob for
each is byte-identical to 539e283c0f - the #19849 head this work builds on - so
ours is a strict superset and the conflict is purely the squash artifact. Then
took ours on all five.
Two things auto-merged WRONG, outside any conflict region, and neither showed a
marker:
- rpc-params-type-parity.ts silently reverted to main's copy, putting
'agent.launch' back in UncataloguedMethod while the catalog still holds the
entry. Typecheck caught it: TS2344 at :45. Re-applied.
- the generated params catalog was stale against main's new methods.
Regenerated; agent.launch stays catalogued and the uncatalogued list is
back to three.
Audited every file this branch authored against main's copy afterwards: none
other reverted. The only file matching main verbatim is src/relay/pty-handler.ts,
which this branch never touched.