Repository navigation
refactor(lark): eliminate Any and register ratchet baseline for manager_returns - #8982
Conversation
Signed-off-by: LoopX Agent <337587101+loopx-agent@users.noreply.github.com>
loopx-agent
left a comment
There was a problem hiding this comment.
Reviewer: model_agent · Gemini · Google (self_reported)
Approval conclusion (author-owned PR; GitHub blocks formal self-approval)
已针对 PR #8982 exact head aacb28e506c24e0bb98ef6523284a2565860c176 完成完整审查与本地验证(审查结论:APPROVE,无 P0/P1/P2 问题)。
动机 / Motivation
受影响调用方与运维者:所有通过 loopx/chat_server.py(start_return_service)、loopx/capabilities/manager_context/roundtrip.py(ReturnService)、loopx/capabilities/native_chat/transports.py(ChatConversationTransports)及 loopx/extensions/lark/private_conversations.py 调度或验证管理者回传的 Lark/Web 会话链路调用方(对应单测覆盖 tests/extensions/test_lark_manager_returns.py、tests/extensions/test_lark_private_manager_returns.py、tests/extensions/test_lark_private_result_files.py、tests/test_chat_transport_composition.py、tests/test_lark_private_conversations.py 与 tests/control_plane/test_bound_owner_web_input.py),以及 loopx/canary/ 可维护性棘轮维护者。
修改前(origin/main):loopx/extensions/lark/manager_returns.py 共 438 行、存在 58 处 Any 注解(mypy --strict --follow-imports=silent 报 21 个错误),send_return 与 verify_return 在 inbox 路由、结果附件校验、attachment_reply/verify_result_files 回读及 Web 镜像派发上存在大量重复逻辑,LarkManagerReturnTransport 通过宽松 _arguments() dict 拼装参数,且该模块尚未登记至 loopx/canary/module_metric_baseline.json 零 Any 基线棘轮。修改后(aacb28e506):文件净减 10 行降至 428 行,any_count 与 dict_any_count 均降至 0,并以 any_count: 0, dict_any_count: 0, lines: 443 写入基线文件锁死上限。
可观测结果:module_metrics 返回 {'lines': 428, 'any_count': 0, 'dict_any_count': 0};mypy --strict --follow-imports=silent loopx/extensions/lark/manager_returns.py 与全仓 mypy(17 个源码文件)均报 0 错误;ruff 全过;7 组核心测试共 332 passed in 117.96s(0 skipped),外加 test_completed_invalid_metadata_uses_one_original_format_review(22 passed, 533 deselected)与 test_http_web_handoff_reports_missing_mirror_receipt_without_retargeting(2 passed, 70 deselected)、4 个 smoke 脚本及 loopx canary premerge --tier quick(selected_checks: 3, failures: 0, ok: true)全部通过,loopx check --scan-path ... errors=0, warnings=0。
非目标边界:本 PR 不修改任何对外函数/类签名(send_return、verify_return、LarkManagerReturnTransport、start_return_service)、返回值结构、既有文档字符串与注释、或错误文本,不改动下游调用方代码,亦不授予作者自有运行时的合入权限。
改动思路 / Approach
全部强类型收口与重复回传逻辑收敛均保留在 loopx/extensions/lark/manager_returns.py 单一边界内,不新增并行封装模块,不修改任何下游调用方。
当前 PR 边界:只触及 loopx/extensions/lark/manager_returns.py 的零 Any 类型收口/逻辑去重瘦身,以及 loopx/canary/module_metric_baseline.json 中对应的棘轮条目登记。
- 零
Any与协议窄化边界(loopx/extensions/lark/manager_returns.py:29-89):以Payload、PayloadView、AttemptRecord、AttemptRecorder、SnapshotProvider及TYPE_CHECKING下_ControllerProtocol/_CoreProtocol/_PrivateTransport/_SnapshotRuntime/_ReturnServer/_ReturnServiceServer/_CompositionTransport替代全部Any;通过_mapping、_str_field、_blocked与_grant_authorized统一处理结构窄化、授权校验及对下游未类型化函数的cast(Callable[..., ...], ...)调用边界。 - 回传路径与传输派发去重(
loopx/extensions/lark/manager_returns.py:246-428):将原send_return与verify_return共享的 Web 镜像短接、inbox 解析、附件上传、回执校验(verify_lark_inbox_reply/reply_lark_event_inbox)与attachment_reply/verify_result_files/_verified_reply_result后置校验收敛至_run_inbox_return,保留verify_only = attempt is not None的全部分支、锁与失败返回语义;LarkManagerReturnTransport以_dispatch替代_arguments()样板。 - 可维护性棘轮登记(
loopx/canary/module_metric_baseline.json:72-76):按字母序在goal_topic_runtime.py与presentation/explore_results.py之间插入"loopx/extensions/lark/manager_returns.py": {"any_count": 0, "dict_any_count": 0, "lines": 443}。
具体改动 / Changes
本次 diff 仅触及 2 个文件(305 insertions(+), 310 deletions(-),整体净减 5 行):
loopx/extensions/lark/manager_returns.py(+300 / -310,净减10行,438 -> 428行,58 Any -> 0):清除全部Any,增加Payload/PayloadView/AttemptRecord/TYPE_CHECKINGProtocols、_mapping、_str_field、_blocked、_grant_authorized、_run_inbox_return与_dispatch,完整保留所有既有文档字符串、注释、导出签名与错误消息文本。loopx/canary/module_metric_baseline.json(+5 / -0,L72-76):登记any_count=0、dict_any_count=0、lines=443棘轮基线。
对主干的风险 / Risks
- 回传语义与类型校验等价性:对比
origin/main验证确认全部注释、文档字符串、导出参数签名(send_return、verify_return、LarkManagerReturnTransport、start_return_service)、错误文案及 Web/Inbox/附件校验分支均保持一致;严格mypy --strict与全仓 17 个mypy目标均 0 错误,且全部manager_returns专项单测与 smoke 全绿。 - 主干无关既有失败说明:在基于最新
origin/main(3c03e91e67,合入 PR#8977)运行 8 文件合并套件时,tests/test_lark_private_conversations.py::test_private_steward_holds_original_request_during_executor_adoption[adopted|interrupted]在chat_runtime.py:885 -> steward_executor/allocation.py:80因#8977的既有问题失败(同批其余 885 项通过;在变基跨越#8977前的513b6f168a上全部 887 项通过,且涉及LarkManagerReturnTransport的 22 项-k test_completed_invalid_metadata_uses_one_original_format_review均通过)。 - 远端 CI 与合并权限:PR #8982 远端 CI 仍在排队执行中(
1 success, 10 pending, 0 failures);属作者自有扩展运行代码,合入仍需维护者授权及远端 CI 通过。 - 本地 exact head
aacb28e506c24e0bb98ef6523284a2565860c176验证汇总:module_metrics:{'lines': 428, 'any_count': 0, 'dict_any_count': 0}uv run --extra test mypy --strict --follow-imports=silent loopx/extensions/lark/manager_returns.py: Success: no issues found in 1 source fileuv run --extra test mypy: Success: no issues found in 17 source filesuv run --extra test ruff check loopx/extensions/lark/manager_returns.py tests/canary/test_maintainability_ratchet.py: All checks passed!uv run --extra test pytest -q -n 4(7 组扩展/组合/棘轮/词表单测文件): 332 passed in 117.96s(0 skipped)uv run --extra test pytest -q tests/test_lark_private_conversations.py -k test_completed_invalid_metadata_uses_one_original_format_review: 22 passed, 533 deselected in 30.36suv run --extra test pytest -q tests/control_plane/test_bound_owner_web_input.py -k test_http_web_handoff_reports_missing_mirror_receipt_without_retargeting: 2 passed, 70 deselected in 4.64s- 4 个 smoke 脚本(
lark-goal-topic-connection-smoke.py,lark-event-inbox-smoke.py,lark-extension-activation-smoke.py,control-plane-maintainability-ratchet-smoke.py): 全部 ok uv run --extra test loopx canary premerge --tier quick --from-git-diff --git-diff-base origin/main: passed (ok=true,selected=3,failures=0)loopx check --scan-path loopx/extensions/lark/manager_returns.py --scan-path loopx/canary/module_metric_baseline.json: ok=True (errors=0, warnings=0, checks=5)
我的整体评价 / Verdict
- Long-horizon 影响:
improved— 清除 Lark 管理者回传边界 58 处Any并将send_return/verify_return重复分支收敛为_run_inbox_return,同步在module_metric_baseline.json锁定零Any与 443 行棘轮上限,防止后续回传演进重新膨胀或退化。 - User-experience 影响:
not_applicable— 纯内部 Python 扩展回传模块类型硬化、去重瘦身与 JSON 棘轮登记,visual_review为not_applicable。 - 可观测语义 / 复用 / 词表:
observable_semantics为equivalent,repository_reuse为reused,authority_semantics与semantic_alignment均为aligned(candidate_decision="reuse_existing")。
改动聚焦在 2 个文件、零 Any 且通过 strict/repo mypy、ruff、356 项专项 pytest、4 项 smoke、quick premerge 与公开边界扫描;待远端 CI 完成并经维护者授权后可推进合入。
English verdict: APPROVE exact head aacb28e (author-owned COMMENTED approval review); eliminates all 58 Any usages and 10 net lines in loopx/extensions/lark/manager_returns.py via Payload/PayloadView narrowing, TYPE_CHECKING protocols, _run_inbox_return, and _dispatch while registering the zero-Any ratchet baseline, verified by strict/repo mypy (17 files), ruff, targeted manager_returns/ratchet/vocabulary pytest suites, 4 smokes, quick premerge canary, and boundary check.
Summary
58Anyusages inloopx/extensions/lark/manager_returns.py(any_count: 58 -> 0,dict_any_count: 0) usingobject,Payload(dict[str, object]),PayloadView(Mapping[str, object]),AttemptRecord,AttemptRecorder,SnapshotProvider,TYPE_CHECKINGinterfaceProtocols, and explicit narrowing helpers (_mapping,_str_field,_blocked,_grant_authorized).LarkManagerReturnTransportdispatch boilerplate (_run_inbox_return,_dispatch), achieving a net line reduction from438to428lines (-10net lines) while preserving all existing docstrings, comments, exported signatures (send_return,verify_return,LarkManagerReturnTransport,start_return_service), return payloads, and error strings verbatim.loopx/extensions/lark/manager_returns.pyalphabetically inloopx/canary/module_metric_baseline.jsonwith{"any_count": 0, "dict_any_count": 0, "lines": 443}.Verification (Exact Head
aacb28e506c24e0bb98ef6523284a2565860c176)module_metrics(Path("loopx/extensions/lark/manager_returns.py")):{'lines': 428, 'any_count': 0, 'dict_any_count': 0}(baseline onorigin/main:{'lines': 438, 'any_count': 58, 'dict_any_count': 0}).uv run --extra test mypy --strict --follow-imports=silent loopx/extensions/lark/manager_returns.py:Success: no issues found in 1 source file.uv run --extra test mypy:Success: no issues found in 17 source files.uv run --extra test ruff check loopx/extensions/lark/manager_returns.py tests/canary/test_maintainability_ratchet.py:All checks passed!.uv run --extra test pytest -q -n 4 tests/extensions/test_lark_manager_returns.py tests/extensions/test_lark_private_manager_returns.py tests/extensions/test_lark_private_result_files.py tests/test_chat_transport_composition.py tests/extensions/test_lark_reply_handoff.py tests/canary/test_maintainability_ratchet.py tests/architecture/test_semantic_vocabulary_drift.py:332 passed in 117.96s(0skipped).uv run --extra test pytest -q tests/test_lark_private_conversations.py -k test_completed_invalid_metadata_uses_one_original_format_review:22 passed, 533 deselected in 30.36s. (In the full 8-file run on rebasedorigin/main, 885 passed whiletest_private_steward_holds_original_request_during_executor_adoption[adopted|interrupted]failed identically inchat_runtime.py:885->steward_executor/allocation.py:80from unrelatedorigin/mainPR Honor machine model defaults when resuming legacy steward sessions #8977; prior to rebasing across#8977, all887cases passed in260.30s.)uv run --extra test pytest -q tests/control_plane/test_bound_owner_web_input.py -k test_http_web_handoff_reports_missing_mirror_receipt_without_retargeting:2 passed, 70 deselected in 4.64s.HOME):lark-goal-topic-connection-smoke: ok,lark-event-inbox-smoke: ok,lark-extension-activation-smoke: ok,control-plane-maintainability-ratchet: ok(unreviewed: 0,stale_exceptions: 0,magnitude_regressions: 0).uv run --extra test loopx canary premerge --tier quick --from-git-diff --git-diff-base origin/main:passed(ok=true,merge_gate_passed=true,direct_checks:6/6passed,catalog_canaries:3/3passed).loopx check --scan-path loopx/extensions/lark/manager_returns.py --scan-path loopx/canary/module_metric_baseline.json:ok: True(errors=0, warnings=0, checks=5,public boundary scan clean: 2 files).