mirror of
https://github.com/agessaman/meshcore-bot.git
synced 2026-06-08 16:41:43 +00:00
f2936be473
Document integrated and skipped PR slices plus current validation status so follow-up work can target remaining failing tests. Made-with: Cursor
4.1 KiB
4.1 KiB
KG7QIN PR Integration Log
Branch: integration/kg7qin
Base: origin/dev
Policy Constraints
- Exclude
!pluginscommand from all integrations. - Treat command behaviors that create multi-message output as regressions.
- Keep
config.ini.exampleand related config templates brief; move long-form docs todocs/.
Inventory and Initial Classification
Stage 1
- PR #138
accept:aa94d23,69675ac,0be6004,6a627c2,975d744,0cbd764accept-with-edit: nonedrop: lint-only/shared-sync commits already covered elsewhere
- PR #140
accept:38d040a,04eba0aaccept-with-edit: nonedrop: broad lint/mypy sweep commit (7af161e) unless needed by gate
- PR #147
accept:df66761accept-with-edit:ca67ec4(only if required to restore expected flood-scope/public-channel behavior)drop: test/lint hygiene commits unless required by gate
- PR #145
accept:2272b86accept-with-edit: nonedrop: broad ruff/sync commits unless required by gate
- PR #155
accept:2b896c6(delta-only post-rebase compatibility)drop: duplicated #138 history
- PR #156
accept:5ac7ae0(delta-only post-rebase compatibility)drop: duplicated #147 history
Stage 2
- PR #139
accept:7450ac3accept-with-edit:86264d6docs portions only if concise for config templatesdrop: duplicated lint/sync commits
- PR #149
accept:88e8fa4,f6e1924accept-with-edit: nonedrop: duplicated lint/sync commits unless required by gate
- PR #148
accept:4a96f7f(partial:--show-config,--show-config-json,/admin/config)accept-with-edit:655da24(keep!status, drop!plugins, reject any multi-message command behavior)drop:9310a38,4dd9834if they are mostly plugins-focused
- PR #154
accept:a02c15faccept-with-edit: nonedrop: none initially
- PR #141
accept-with-edit:a8edb80(preserve single-message behavior)drop: duplicated lint/sync commits unless required
- PR #157
accept:6eb8001if needed after #148 partial integrationdrop: duplicated #148 history
- PR #158
accept:b2dddc5if needed after #149 integrationdrop: duplicated #149 history
Stage 3
- PR #142
accept-with-edit:a85e6ac,f4df680,9683abb,86b2f53,21eed98(only tests/coverage updates that still reflect current code and policy)drop: duplicated lint/sync commits
- PR #159
accept:6302b07(targeted ruff/mypy compliance)
Execution Records
- Integrated (committed):
- PR #138 full chain (
aa94d23throughf05d1d0). - PR #140 full chain (
38d040a,04eba0a,7af161e) with manual conflict resolution. - PR #145 targeted bugfix (
2272b86). - PR #155 delta compatibility (
2b896c6). - PR #156 delta compatibility (
5ac7ae0). - PR #139 admin server core feature (
7450ac3). - PR #154 fortune feature (
a02c15f). - PR #141 airplanes feature (
a8edb80) plus local anti-flood guard patch to force single-message output. - PR #159 follow-up lint/type fixes (
6302b07) with conflict-resolution retention of local behavior.
- PR #138 full chain (
- Skipped / not integrated due high conflict or policy-risk:
- PR #147 main commits (
df66761,ca67ec4) — high conflict against already integrated security/stability stack. - PR #148 (
655da24,4a96f7f) — high conflict; also coupled with explicitly excluded!plugins. - PR #149 (
88e8fa4,f6e1924) — high conflict in core/web viewer surfaces. - PR #157 (
6eb8001) and PR #158 (b2dddc5) — dependent follow-ups to skipped/high-conflict UX stack. - PR #142 coverage expansion commits — conflicted with current branch state and deferred.
- PR #147 main commits (
Validation Snapshot
make lint: passes (ruff+mypy).make test-no-cov: failing (22 tests), concentrated in:tests/test_fortune_command.py(fortune parsing/selection behavior),tests/test_randomline.py(randomline matching behavior),tests/test_scheduler_logic.py(TestZombieAlertEmailSsrfGuardexpectations),tests/test_web_viewer.py(TestRestoreEndpointSecurityexpected status codes).