mirror of
https://github.com/stablyai/orca.git
synced 2026-10-04 08:02:09 +00:00
Merge Sim
c0ab558bd0
Reconciles this lane onto the landed Codex structured native-chat substrate (#16729).
This branch was a divergent SIBLING of that substrate, not a descendant: merge-base 2b1e69d4b0
(2026-08-11), 1125 commits behind, carrying its own pre-split copy of the journal, session record,
lease, host RPC, reducer, outbox, tab model, restart reconciliation, capability gating, and
process-ownership mechanisms.
Resolution (216 conflicts: 151 both-added, 61 both-modified, 4 delete-vs-modify):
- Shared substrate resolves to main wholesale. Main's copy is authoritative; this branch's is a
stale sibling. 91 take-main paths verified byte-identical to the pin.
- Main's deletions are honoured (4 paths). Branch-only content was extracted to evidence first;
src/shared/types.ts needs zero re-expression (main's tab-types.ts already carries all of it).
- The lane's parallel handoff state machine and generic substrate copies are dropped (42 paths);
main owns those mechanisms and terminal/native switching is out of scope for this PR.
- The remaining 79 resolve to main's architecture per the hand-resolution analysis; the named
branch provider deltas are re-expressed at main's current seams in the implementation phase
rather than merged as parallel code.
This merge establishes the reconciled base. It does NOT yet deliver working Claude structured
chat: the surviving Claude adapter is written against the old substrate and the Claude provider
behaviour is re-added on top from the preferred source in the implementation phase.
79 branch-only test names are absent from main's entire tree and are tracked for explicit
disposition in CLAUDE-STRUCTURED-DISPOSITION-TABLE.md; none are dropped silently.