From e7b7e0bca59d811e6c2514a310a05fe40fe2a1cc Mon Sep 17 00:00:00 2001 From: bandzalkin Date: Tue, 20 Oct 2026 22:17:57 +0300 Subject: [PATCH 1/3] chore(fork): carry the typed agent activity stack Select #841 (which inherits the merged #839 and #840) and our gate #874 after it, restack #763 after #874 so its omp_acp.py removal composes once against #841's edit, and select #880 (native OMP activity hooks) after #763. The #857 source branch was rebased onto current main after the test reorg. --- .github/band-agent/prs.txt | 5 ++++- FORK-CHANGES.md | 11 ++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/band-agent/prs.txt b/.github/band-agent/prs.txt index 2b0d06cfc..a517cc0a1 100644 --- a/.github/band-agent/prs.txt +++ b/.github/band-agent/prs.txt @@ -1,8 +1,10 @@ # Our open upstream pull requests (band-ai/band-sdk-python), applied in this order # at their current heads. "N after M" marks N as stacked on M: while M is open, only # N's own changes on top of M are applied. +841 +874 after 841 857 -763 +763 after 874 854 after 763 853 855 @@ -18,3 +20,4 @@ 845 after 844 848 after 763 850 after 844 +880 after 763 diff --git a/FORK-CHANGES.md b/FORK-CHANGES.md index ae5a910de..14ee309f6 100644 --- a/FORK-CHANGES.md +++ b/FORK-CHANGES.md @@ -34,9 +34,18 @@ Copilot/ACP #853 replaces #799, native OMP #854 replaces #798, Codex #855 replaces #797, and Claude #856 replaces #800. Native OMP follows #763; Claude follows #855. All corrections stay in those source branches, not in generated SDK commits. -Backlog recovery #857 likewise replaces #730 without changing its source head. +Backlog recovery #857 likewise replaces #730; its source branch was rebased +onto current `main` on 2026-10-20 after the test reorg moved its files. Every selected upstream pull request is maintained from this fork. +The typed agent activity stack (Band's INT-1744) is carried through #841, +whose branch inherits the merged #839 and the #840 delivery work, with our +#874 stacked after #841: it gates tool names in the activity detail on the +adapter's tool-narration choice, pending the producers adopting the same +rule. Because #763 deletes `omp_acp.py` while #841 edits it, #763 lists +`after 874` so its removal composes once, and #880 (activity hooks for the +native OMP adapter, which the stack does not cover) follows #763. + Native OMP catalogs (#848) use `after 763`: their branch inherits the native adapter and transplanted copies of #844's shared changes, not #844's head. Identical shared, Windows Job and ACP cleanup corrections carried by multiple From 0af872c3ef06d7a9ece8b64486b1827241c6d781 Mon Sep 17 00:00:00 2001 From: bandzalkin Date: Tue, 20 Oct 2026 22:27:05 +0300 Subject: [PATCH 2/3] chore(fork): order the host stack ahead of the native OMP removal #763 deletes omp_acp.py while #841 edits it; every branch that carries the stack's tree must apply its own changes before that deletion, so #843-#852 precede #763 and the native OMP family follows it. --- .github/band-agent/prs.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/band-agent/prs.txt b/.github/band-agent/prs.txt index a517cc0a1..1fed29d3c 100644 --- a/.github/band-agent/prs.txt +++ b/.github/band-agent/prs.txt @@ -4,12 +4,9 @@ 841 874 after 841 857 -763 after 874 -854 after 763 853 855 856 after 855 -795 after 763 843 849 after 843 844 @@ -18,6 +15,9 @@ 846 after 844 852 after 846 845 after 844 -848 after 763 850 after 844 +763 after 874 +854 after 763 +795 after 763 +848 after 763 880 after 763 From 55ccded26a44eb7bec32ad8a91e7b4ea75020d29 Mon Sep 17 00:00:00 2001 From: bandzalkin Date: Tue, 20 Oct 2026 23:46:59 +0300 Subject: [PATCH 3/3] chore(fork): land native OMP activity hooks in #763 The hooks ride the native branch itself (contract 2026-10-20): #880 is retired and its selection entry dropped. --- .github/band-agent/prs.txt | 1 - FORK-CHANGES.md | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/band-agent/prs.txt b/.github/band-agent/prs.txt index 1fed29d3c..ca277bb25 100644 --- a/.github/band-agent/prs.txt +++ b/.github/band-agent/prs.txt @@ -20,4 +20,3 @@ 854 after 763 795 after 763 848 after 763 -880 after 763 diff --git a/FORK-CHANGES.md b/FORK-CHANGES.md index 14ee309f6..518e2fbce 100644 --- a/FORK-CHANGES.md +++ b/FORK-CHANGES.md @@ -43,8 +43,8 @@ whose branch inherits the merged #839 and the #840 delivery work, with our #874 stacked after #841: it gates tool names in the activity detail on the adapter's tool-narration choice, pending the producers adopting the same rule. Because #763 deletes `omp_acp.py` while #841 edits it, #763 lists -`after 874` so its removal composes once, and #880 (activity hooks for the -native OMP adapter, which the stack does not cover) follows #763. +`after 874` so its removal composes once; the native OMP activity hooks +(tool and permission) land on #763's own branch. Native OMP catalogs (#848) use `after 763`: their branch inherits the native adapter and transplanted copies of #844's shared changes, not #844's head.