From 5d0d5c5f074c1252473b4fc49c1cb67f9070650e Mon Sep 17 00:00:00 2001 From: Hibryda Date: Fri, 13 Mar 2026 02:40:42 +0100 Subject: [PATCH] chore: rebase hib_changes onto dexter_changes and update migration TODOs --- TODO.md | 5 +++-- agent-orchestrator | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/TODO.md b/TODO.md index 844014d..ccdcb9d 100644 --- a/TODO.md +++ b/TODO.md @@ -3,8 +3,9 @@ ## Active ### Migration to agent-orchestrator -- [ ] **Migrate to agent-orchestrator repo** -- Tribunal plan (78% confidence): cherry-pick 7 BTerminal-unique commits onto hib_changes, rebase onto dexter_changes (55ba8d0). Pre-flight: topology verification, content dedup, CLAUDE.md Commit Zero. Decide: do v1 bterminal.py features belong in agent-orchestrator? Full report: .tribunal/tribunal-report.md -- [ ] **Integrate dexter_changes features** -- 13 commits: Aider provider, splash screen, provider/model unification, Tier 2 btmsg access, auto-wake on btmsg. After cherry-pick + rebase onto hib_changes. +- [ ] **Review Dexter's 13 feature commits** -- hib_changes rebased onto dexter_changes (55ba8d0). Need to review: Aider provider, splash screen, provider/model unification, Tier 2 btmsg access, auto-wake on btmsg. Then push hib_changes and start working from agent-orchestrator repo. +- [ ] **CLAUDE.md Commit Zero** -- Update agent-orchestrator's CLAUDE.md to reflect rebrand + new features. Update docs/ accordingly. +- [ ] **Switch primary development to agent-orchestrator** -- After review + CLAUDE.md update, develop on hib_changes in agent-orchestrator. BTerminal repo stays for v1 production only. ### v3.1 Remaining - [ ] **Multi-machine real-world testing** -- TLS added to relay. Needs real 2-machine test. Multi-machine UI not surfaced in v3, code exists in bridges/stores only. diff --git a/agent-orchestrator b/agent-orchestrator index 4fee567..55ba8d0 160000 --- a/agent-orchestrator +++ b/agent-orchestrator @@ -1 +1 @@ -Subproject commit 4fee567dd9b59b86108079331ee472503d056626 +Subproject commit 55ba8d0969b4c9e34e47fe621ea4812528441365