Repository navigation
refactor(chat): move legacy status projection to status_api, deduplicate chat_server, and retire ceiling - #8908
loopx-agent wants to merge 1 commit into
Conversation
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 #8908 exact head d6fce1705c70741763683d45d3aa8a5e9624f1a6 完成完整源码逐行核对与本地实跑验证(审查结论:APPROVE,无 P0/P1/P2 阻断问题)。
动机 / Motivation
受影响调用方与维护者:依赖 loopx_chat_status_v0 状态投影的 Chat 服务端及本地启动链路(loopx/chat/status_api.py、loopx/chat_server.py 与 examples/loopx-chat-server-smoke.py)、所有调用 ChatRequestHandler 会话列表/动作变更/Goal Channel 接口的前端与客户端,以及 loopx/canary/ 可维护性棘轮维护者。
修改前(d210e4cc1d):loopx/chat_server.py 膨胀至 2,037 行并携带 25 处 Any 与 lines: 2058 棘轮豁免,将本属 loopx/chat/status_api.py(ChatStatusRequestMixin 所在模块)的 _compact_todo、_goal_todos、build_chat_status_projection 与 build_bounded_chat_status_projection 滞留在 HTTP 传输层内;同时 ChatRequestHandler 内部在查询参数裁剪、Goal 注册表读取、Goal Channel 错误包回填、动作空请求体校验与失败落盘、do_GET/do_POST 路径分段以及 serve_chat 中 lark_cli_cmd 解析上存在多处重复样板。修改后(d6fce1705c):纯状态投影构建器迁入规范所有者 loopx/chat/status_api.py,loopx/chat_server.py 降至 1,776 行(净减 261 行)、any_count 降至 16 并彻底退出 >2,000 行棘轮豁免,整仓 4 个修改文件净减 101 行(+292/-393)。
可观测结果:module_metrics 实测 loopx/chat_server.py 为 {'lines': 1776, 'any_count': 16, 'dict_any_count': 0}、loopx/chat/status_api.py 为 {'lines': 539, 'any_count': 21, 'dict_any_count': 0};全仓跨语言/模块检索确认无任何遗留的 loopx.chat_server 旧投影导入;examples/loopx-chat-server-smoke.py 输出 loopx-chat-server-smoke: ok;非重叠 Chat 与动作/棘轮单测共 538 passed(另 1 项 test_http_recheck_starts_existing_owners_once_and_preserves_disabled_features 已在未改动 main 6844005820 复现为既有一致失败);ruff、mypy(17 文件)、canary premerge --tier quick 与 loopx check 均全绿通过。
非目标边界:本 PR 仅处理 loopx/chat_server.py 向既有 loopx/chat/status_api.py 的状态投影归位与局部 HTTP handler 去重和棘轮上限退役,不引入兼容重导出垫片,不修改 HTTP 路由、状态码、schema_version 载荷字段或 ChatRequestHandler monkeypatch 契约,亦不修复 d210e4cc1d 基线既有的 content_digest_single_owner.test.ts:908 或 test_background_services_api.py 既有环境失败,也不授予自动合入权限。
改动思路 / Approach
本次重构严格复用既有模块与运行时契约:将 loopx_chat_status_v0 的四个状态投影函数直接迁至其既有状态接口所有者 loopx/chat/status_api.py(在 build_chat_status_projection 内部延迟导入 ..chat_server._goal_public_context 以规避模块循环导入并完整保留既有测试 monkeypatch 点),不保留兼容垫片并同步将 examples/loopx-chat-server-smoke.py 切至规范导入;在 loopx/chat_server.py 内通过 _query_text、_load_registry_and_goal、_send_goal_channel_packet、_read_empty_action_body、_mark_action_failed、_run_action_mutation 与复用单次 parts 分片消除重复控制流,保持行为、报错文本与 HTTP 状态码完全等价。
当前 PR 边界:改动严格收敛于 loopx/chat/status_api.py、loopx/chat_server.py、examples/loopx-chat-server-smoke.py 与 loopx/canary/module_metric_baseline.json 4 个文件;远端 d210e4cc1d 基线滞后引发的 CI 失败与 main 合入重放、以及非本 PR 导致的后台轮询测试失败均保持独立边界。
- 状态投影归位(
loopx/chat/status_api.py:383-539):将_compact_status_text、_compact_todo、_goal_todos、build_chat_status_projection与build_bounded_chat_status_projection从chat_server.py移至status_api.py;逐行对照确认queue_by_goal仅收纳dict元素,原先build_chat_status_projection中if isinstance(item, dict)的else分支本为不可达死代码,简化后与原运行时字典输出逐字段一致。 - Handler 与服务组装去重(
loopx/chat_server.py:191-200,1039-1042,1215-1264,1364-1748):抽取模块级_query_text与_load_registry_and_goal,并在ChatRequestHandler上收口_send_goal_channel_packet、_read_empty_action_body、_mark_action_failed与_run_action_mutation(_action_transition通过局部transitions分派表映射regenerate/reject/defer与对应 201/200 状态码,_action_apply保留ProtectedActionGate409 与 424canonical_action_failed语义);do_GET/do_POST复用单次parts = path.strip("/").split("/");serve_chat复用lark_cli_cmd = lark_cli_resolution.command or "lark-cli"。 - 棘轮豁免退役(
loopx/canary/module_metric_baseline.json:47-50):删除loopx/chat_server.py的"lines": 2058豁免并将"any_count"上限由25下调至16;迁入的loopx/chat/status_api.py实测539行、any_count=21,远低于默认上限且通过棘轮门禁。
具体改动 / Changes
本次完整 diff 覆盖 4 个文件(292 insertions(+), 393 deletions(-),整体净减 101 行):
loopx/chat/status_api.py(+161 / -0,共539行):补全registry_goals、resolve_state_file与build_active_state_structured_projection导入,承接_compact_status_text、_compact_todo、_goal_todos、build_chat_status_projection与build_bounded_chat_status_projection,在build_chat_status_projection内通过from ..chat_server import _goal_public_context保持零循环依赖。loopx/chat_server.py(+128 / -389,2,037 -> 1,776行,25 Any -> 16):移除已迁移投影函数及无用导入build_active_state_structured_projection,新增_query_text、_load_registry_and_goal、_send_goal_channel_packet、_read_empty_action_body、_mark_action_failed、_run_action_mutation,并在do_GET/do_POST/serve_chat消除重复拆分与 CLI 解析。examples/loopx-chat-server-smoke.py(+1 / -1,L9-14):将build_bounded_chat_status_projection改为直接从loopx.chat.status_api导入。loopx/canary/module_metric_baseline.json(+2 / -3,L47-50):删除loopx/chat_server.py的"lines": 2058豁免并收紧"any_count": 16。
对主干的风险 / Risks
- 调用方与循环导入检查:全仓检索
loopx/、tests/、examples/、apps/与scripts/确认没有任何模块或测试仍从loopx.chat_server导入build_chat_status_projection、build_bounded_chat_status_projection、_compact_todo或_goal_todos;test_chat_internal_module_layout.py与test_chat_status_owner.py验证嵌套模块与 HTTP handler patch 点完好;git merge-tree --write-tree验证相对当前origin/main(6844005820)无任何文本冲突。 - 公共与私密边界 & 远端 CI 归因:
loopx check与canary premerge --tier quick对全部 4 个改动文件扫描报 0 误漏、0 泄露;远端 CI 中typescript-core (2/3)因基线d210e4cc1d既有消费者清单差异(content_digest_single_owner.test.ts:908报+ 'control_plane/quota/settlement_readback.ts')失败并级联导致typescript-coverage跳过与checks/merge-gate失败、test-shard超时取消,与本 PR 纯 Python 重构无关。 - 本地完整验证结果(exact head
d6fce1705c70741763683d45d3aa8a5e9624f1a6):module_metrics:loopx/chat_server.py(lines=1776, any_count=16, dict_any_count=0),loopx/chat/status_api.py(lines=539, any_count=21, dict_any_count=0)uv run --extra test ruff check loopx/chat_server.py loopx/chat/status_api.py examples/loopx-chat-server-smoke.py tests/test_chat_*.py: All checks passed!uv run --extra test mypy: Success: no issues found in 17 source filesuv run --extra test python examples/loopx-chat-server-smoke.py: loopx-chat-server-smoke: okuv run --extra test python examples/control_plane/control-plane-maintainability-ratchet-smoke.py: control-plane-maintainability-ratchet: ok (unreviewed=0, stale_exceptions=0, magnitude_regressions=0)uv run --extra test python examples/cli-control-plane-command-modularization-smoke.py: cli-control-plane-command-modularization-smoke: okpytest非重叠套组共 538 passed:15 项test_chat*套件411 passed+test_maintainability_ratchet.py14 passed+test_chat_gate_decisions.py/test_reviewed_terminal_actions.py/test_chat_action_kind_owner.py56 passed+test_chat_explore_results.py/test_openai_keys.py/test_background_services_api.py/test_research_analysis_api.py57 passed, 1 pre-existing failure(test_http_recheck_starts_existing_owners_once_and_preserves_disabled_features已在未改动main6844005820复现相同报错)uv run --extra test loopx canary premerge --tier quick --from-git-diff --git-diff-base d210e4cc1d002f92498b2811c565b9430e79f4c1: passed(ok=true,failures=0,manual_holds=0)uv run --extra test loopx check --scan-path ...: ok=True (errors=0, warnings=0)
我的整体评价 / Verdict
- Long-horizon 影响:
improved— 消除了chat_server.py超过 2,000 行的棘轮豁免并收回至1,776行(any_count25 -> 16),将纯状态投影收敛到既有loopx/chat/status_api.py所有者并消除多处 HTTP handler 重复控制流。 - User-experience 影响:
preserved— 保留全部 HTTP 路由、状态码、JSONschema_version载荷字段、ChatRequestHandlermonkeypatch 点与终端/Web 行为;visual_review为not_applicable(无前端渲染或 UI 布局修改)。 - 可观测语义 / 复用 / 词表:
observable_semantics为equivalent,repository_reuse为reused,authority_semantics与semantic_alignment均为aligned(candidate_decision="reuse_existing")。
改动干净收敛、538 项非重叠测试与端到端 loopx-chat-server-smoke 及 premerge quick 全部通过、无任何 P0/P1/P2 阻断项。本 PR 为作者自有且触及 loopx/** 运行时与控制面模块,正式合入仍需合入前刷新基线 CI 与维护者授权。
English verdict: APPROVE exact head d6fce17 (author-owned COMMENTED approval review); relocates status projection helpers into loopx/chat/status_api.py, slims loopx/chat_server.py from 2037 to 1776 lines (any_count 25 -> 16) retiring its >2000-line ceiling, and passes 538 disjoint pytest cases (with 1 baseline-reproduced failure), loopx-chat-server-smoke, ruff, mypy, maintainability ratchet, and quick premerge canary.
|
This pull request has merge conflicts with Choose the remote for the base repository, not an out-of-date fork. git fetch upstream
git rebase upstream/main
# Resolve each conflict, git add the resolved files, then git rebase --continue.
git push --force-with-lease origin HEADFor a same-repository clone whose Keep the DCO |
d6fce17 to
e3d375c
Compare
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 #8908 变基后 exact head e3d375cb79b965d241fa3ad4936eb68932f49fbd(基线 origin/main 41ea75e89892ed88d0ae543e97e31aad0a181c47)完成完整源码核对、跨基线等价性实测与本地全套验证(审查结论:APPROVE,无 P0/P1/P2 阻断问题)。
动机 / Motivation
受影响调用方与维护者:依赖 loopx_chat_status_v0 状态投影与 Chat HTTP 服务入口(loopx/chat/status_api.py、loopx/chat_server.py、examples/loopx-chat-server-smoke.py)的运行时调用方和本地维护者,以及维护 loopx/canary/module_metric_baseline.json 模块体量棘轮的贡献者。 触发场景:当主干继续向 loopx/chat_server.py 添加 /api/attached-sessions 等 HTTP 路由并执行可维护性棘轮检查时,原本滞留在传输层的纯状态投影构建器与重复 handler 样板让该模块持续处于两千行上限以上。
变更前(41ea75e89892ed88d0ae543e97e31aad0a181c47):loopx/chat_server.py 为 2,047 行并带有 lines: 2058、any_count: 25 的棘轮豁免,将本应归属 loopx/chat/status_api.py(ChatStatusRequestMixin 所有者)的 _compact_todo、_goal_todos、build_chat_status_projection 与 build_bounded_chat_status_projection 留在 HTTP 传输文件内,同时在 ChatRequestHandler 中重复编写查询参数裁剪、Goal 注册表查找、Goal Channel 错误格式化、动作空请求体校验、失败状态落盘与路径拆分逻辑;若不收口,后续向 chat_server.py 添加 /api/attached-sessions 等新路由会持续迫近两千行上限豁免并加剧状态接口所有者割裂。变更后(e3d375cb79b965d241fa3ad4936eb68932f49fbd):四个状态投影函数迁入 loopx/chat/status_api.py(539 行),loopx/chat_server.py 降至 1,786 行(净减 261 行)且 any_count 降至 16,并同步删除 lines: 2058 豁免、收紧 any_count 上限至 16。
可观测成果:loopx/chat_server.py 实测为 1,786 行、any_count=16(整仓 4 个改动文件 +292/-393 净减 101 行),完整保留 origin/main 新增的 GET /api/attached-sessions 路由与全部 HTTP 状态码/JSON 载荷及测试 monkeypatch 点;基线与当前 head 跨版本对拍指纹同为 23cfd81cc56e1678,Chat 相关 pytest 套件、loopx-chat-server-smoke、ruff、mypy、typecheck:control-plane、loopx check 与 canary premerge quick 全部通过。
非目标边界:本 PR 仅处理状态投影归位、局部 handler 去重与棘轮豁免退役,不添加兼容重导出垫片,不修改 HTTP 路由、状态码或 schema_version 载荷字段,亦不处理独立于本次改动的基线测试环境或既有主干失败。
改动思路 / Approach
架构设计上复用既有单所有者边界:loopx/chat/status_api.py 已是 ChatStatusRequestMixin 与 goal_read_runtime_root 的规范所有者,因此将纯状态投影函数整体迁入该模块,并在 build_chat_status_projection 内部采用函数级延迟导入 from ..chat_server import _goal_public_context,既彻底避免模块级循环导入,又保留既有测试通过 monkeypatch loopx.chat_server._goal_public_context 注入上下文的契约;同步将唯一外部调用方 examples/loopx-chat-server-smoke.py 切换至规范导入路径,不在 loopx/chat_server.py 保留兼容别名垫片。
在 loopx/chat_server.py 内部仅收敛纯局部重复样板,不更改决策边界或默认策略:抽取模块级纯函数 _query_text 与 _load_registry_and_goal(被 ChatRequestHandler._registry_and_goal 与 serve_chat._wake_goal_context 复用),并在 ChatRequestHandler 上抽出 _send_goal_channel_packet、_read_empty_action_body、_mark_action_failed 与 _run_action_mutation,通过局部变量 transitions 映射 regenerate(201)、reject/defer(200)并复用 do_GET/do_POST 单次 parts = path.strip("/").split("/") 切分与 serve_chat 的 lark_cli_cmd。架构评估结论为 retain:状态投影函数属 projection 职责且应归属于既有所有者 loopx/chat/status_api.py(与 ChatStatusRequestMixin 共处),而 _query_text、_load_registry_and_goal、_send_goal_channel_packet、_read_empty_action_body、_mark_action_failed 与 _run_action_mutation 均属传输层 local_helper,保留在 loopx/chat_server.py 内且未引入新状态、新默认策略或额外权限语义。 当前 PR 边界:改动严格收敛于 loopx/chat/status_api.py、loopx/chat_server.py、examples/loopx-chat-server-smoke.py 与 loopx/canary/module_metric_baseline.json 四个文件内的所有权归位、局部去重与棘轮上限退役,与 origin/main 的 /api/attached-sessions 正交共存。
具体改动 / Changes
本次变基后 exact head e3d375cb79b965d241fa3ad4936eb68932f49fbd 相对 origin/main(41ea75e89892ed88d0ae543e97e31aad0a181c47)共改动 4 个文件(+292/-393,净减 101 行);本维护性重构无独立成文 RFC 规格(spec_basis: no_spec,遵循仓库既有 loopx/canary/module_metric_baseline.json 2,000 行默认上限及 docs/architecture/rfcs/monorepo-distribution-split-v0.md 中 loopx.chat.status_api 单一所有者约定)。
| 文件 | 变更行数 | 角色分类 | 核心内容 |
|---|---|---|---|
loopx/chat/status_api.py |
+161 / -0(539 行) |
生产代码(状态投影归位) | 补全 registry_goals、resolve_state_file、build_active_state_structured_projection 导入,承接 _compact_status_text、_compact_todo、_goal_todos、build_chat_status_projection 与 build_bounded_chat_status_projection |
loopx/chat_server.py |
+128 / -389(1,786 行) |
生产代码(传输层瘦身与去重) | 移除旧状态投影及无用 state_projection 导入,保留 /api/attached-sessions,抽取 _query_text、_load_registry_and_goal、_send_goal_channel_packet、_read_empty_action_body、_mark_action_failed、_run_action_mutation 与单次 parts / lark_cli_cmd |
examples/loopx-chat-server-smoke.py |
+1 / -1 |
示例/smoke | L219 将 build_bounded_chat_status_projection 切换为直接从 loopx.chat.status_api 导入 |
loopx/canary/module_metric_baseline.json |
+2 / -3 |
架构棘轮配置 | 删除 loopx/chat_server.py 的 "lines": 2058 豁免并将 "any_count" 由 25 收紧至 16 |
关键代码讲解
loopx/chat/status_api.py:428-488—build_chat_status_projection:将原驻留于chat_server.py的队列态状态投影构建器迁入status_api.py,函数首行延迟执行from ..chat_server import _goal_public_context防止环依赖并保持test_chat_codex_home.py/test_chat_agent_model_http.py的 monkeypatch 点;由于queue_by_goal字典推导已通过if isinstance(item, dict)过滤且默认值为{},item恒为dict,移除原先不可达的else分支后逐字段输出与基线完全等价。loopx/chat/status_api.py:491-539—build_bounded_chat_status_projection:迁入status_api.py并直接委托同模块build_chat_status_projection,从每个注册 Goal 的STATE.md构建受限首屏loopx_chat_status_v0载荷;在独立临时注册表上对比基线41ea75e89892ed88d0ae543e97e31aad0a181c47与当前 heade3d375cb79b965d241fa3ad4936eb68932f49fbd输出并经 SHA-256 归一化验证,两者摘要均为23cfd81cc56e1678完全一致。loopx/chat_server.py:1216-1265—_run_action_mutation/_action_cancel/_action_transition:将原本在_action_cancel与_action_transition重复实现的空 JSON 请求体校验、404KeyError、409ActionConflictError、400ValueError错误映射与 JSON 响应封装统一收敛至_run_action_mutation;_action_transition使用transitions表严格保持regenerate -> 201、reject/defer -> 200与未知动作 400unsupported action transition,_action_apply则保留 409ProtectedActionGate与 424canonical_action_failed语义并复用_read_empty_action_body与_mark_action_failed。loopx/chat_server.py:1040-1043, 1363-1595—_send_goal_channel_packet与do_GET/do_POST单次路径拆分:_goal_channel_setup与_goal_channel_configure共用_send_goal_channel_packet回填失败error字段并按packet.get("ok")返回 200/400;do_GET与do_POST顶部各执行一次parts = path.strip("/").split("/"),完整保留变基合入的GET /api/attached-sessions(loopx/chat_server.py:1401-1409)及全部会话、动作、turn 控制路由分发。
对主干的风险 / Risks
- 未发现 P0/P1/P2 阻断风险:全仓检索
loopx/、tests/、examples/、scripts/与apps/确认除examples/loopx-chat-server-smoke.py(已同步切换)外无任何其他位置从loopx.chat_server导入已迁移的 4 个投影符号;module_metrics实测loopx/chat_server.py为lines=1786, any_count=16, dict_any_count=0,loopx/chat/status_api.py为lines=539, any_count=21, dict_any_count=0,均满足默认上限与棘轮约束。 - 跨基线行为等价性与负向路径验证:在隔离
HOME环境下分别针对基线41ea75e89892ed88d0ae543e97e31aad0a181c47与 heade3d375cb79b965d241fa3ad4936eb68932f49fbd运行build_bounded_chat_status_projection及真实 loopbackChatHTTPServer请求(GET /api/attached-sessions、GET /api/actions?status=pending、POST /api/actions/missing-id/cancel、POST /api/actions/missing-id/bogus、POST /api/actions/missing-id/regenerate非空体、POST /api/actions/missing-id/apply),两端输出指纹均为23cfd81cc56e1678(PASS);另验证chat_server._goal_public_contextmonkeypatch 仍透传至status_api.build_bounded_chat_status_projection且chat_server未残留兼容别名(PASS)。 - 本地验证汇总(exact head
e3d375cb79b965d241fa3ad4936eb68932f49fbd):- Chat 核心与 HTTP/Status/Layout/Attached-Session/CLI 套件:
tests/test_chat_*.py、tests/test_attached_session_broker.py、tests/test_delivery_review.py、tests/test_host_thread_activity.py、tests/test_cli_entrypoint.py、tests/test_thread_agent_binding.py、以及tests/control_plane/与tests/presentation/相关套组中,排除基线既有故障外全部通过(539 + 325 + 40 + 24 + 244 + 455 非重叠验证通过,其中test_reviewed_terminal_actions.py在临时挂载已构建loopx/web/chat前端资源后 24/24 PASS);examples/loopx-chat-server-smoke.py(挂载本地loopx/web/chat资源)输出loopx-chat-server-smoke: ok(PASS)。 - 静态检查与门禁:
ruff check变更 Python 文件全绿(PASS);python -m mypy17 个受检核心文件零错误(PASS);npm run typecheck:control-plane通过(PASS);loopx check --scan-path ...4 个文件errors=0(PASS);canary premerge --from-git-diff --git-diff-base origin/main --tier quick通过(ok=true,merge_gate_passed=true,direct_failure_count=0,run_failure_count=0,manual_hold_count=0,其中examples/semantic-vocabulary-drift-smoke.py、examples/canary/catalog-planner-smoke.py、scripts/check_rfc_bilingual.py、git diff --check均 PASS);examples/cli-control-plane-command-modularization-smoke.pyPASS。 - 既有基线失败归因(
pre_existing_unrelated,均已在未改动origin/main41ea75e89892ed88d0ae543e97e31aad0a181c47独立复现且不触及本 PR 改动文件):tests/architecture/test_source_session_registry_denial.py::test_direct_project_registry_loaders_have_source_session_denial(报loopx/presentation/goal_storage_api.py)、tests/canary/test_maintainability_ratchet.py::test_current_repository_debt_is_reviewed_without_line_count_pins与control-plane-maintainability-ratchet-smoke.py(报build_heartbeat_prompt与_admitted_interaction_next_cli_actions)、tests/presentation/test_background_services_api.py::test_http_recheck_starts_existing_owners_once_and_preserves_disabled_features、以及tests/test_chat_operation_actions.py4 项activation_state = "stopped"升级校验失败,均在41ea75e89892ed88d0ae543e97e31aad0a181c47复现完全一致的报错特征;依wait_for_ci: false本地优先契约未查询或等待远端 CI(UNVERIFIED诊断态,不影响当前代码审查结论)。
- Chat 核心与 HTTP/Status/Layout/Attached-Session/CLI 套件:
语义与 CI 对齐
本 PR 不引入或修改任何语义词表或枚举成员(candidate_decision: "reuse_existing"),仅依据 loopx/canary/module_metric_baseline.json 棘轮契约退役 loopx/chat_server.py 的 lines: 2058 豁免并将 any_count 上限由 25 收紧至 16,同时对齐 loopx.chat.status_api 单一状态所有者约定。examples/semantic-vocabulary-drift-smoke.py 与 canary premerge --tier quick 的 diff 级棘轮直接检查 module_ceiling_colocation 均已本地通过;远端 CI 按当前 Goal 策略 wait_for_ci: false 未予咨询。
我的整体评价 / Verdict
- Long-horizon 影响:
improved— 消除了loopx/chat_server.py超过 2,000 行的棘轮豁免并压降至 1,786 行(any_count25 -> 16),将纯状态投影收敛至既有loopx/chat/status_api.py所有者并消除重复 HTTP handler 控制流,降低后续路由演进维护成本。 - User-experience 影响:
preserved— 保留全部 HTTP 路由(含变基合入的/api/attached-sessions)、状态码、loopx_chat_status_v0载荷字段、错误消息与ChatRequestHandlermonkeypatch 契约;visual_review为not_applicable(原因:本变更仅涉及 Python 模块 loopx/chat_server.py、loopx/chat/status_api.py、examples/loopx-chat-server-smoke.py 与 JSON 配置 loopx/canary/module_metric_baseline.json,未修改 apps/presentation/ 前端渲染或终端视觉布局。;unverified_scope:none)。 - 可观测语义 / 复用 / 权限与词表:
observable_semantics为equivalent(跨基线对比与真实 HTTP 路径验证指纹一致);repository_reuse为reused;code_volume为necessary(无兼容垫片,净减 101 行);authority_semantics与default_off_isolation均为not_applicable;semantic_alignment为aligned(reuse_existing)。 - 剩余风险与审查声明:唯一架构耦合为
build_chat_status_projection保留函数内延迟导入chat_server._goal_public_context(为兼容现有测试 patch 点所必需),且未执行完整全仓 Python+TS 远端 CI 矩阵;鉴于当前改动全部相关测试、端到端 chat-server smoke、静态检查、公共边界扫描与premerge quick门禁在 exact heade3d375cb79b965d241fa3ad4936eb68932f49fbd均已验证通过,给出批准结论(本 PR 为作者自有且触及loopx/**运行时模块,实际合入仍需维护者权限决策)。
English verdict: APPROVE exact head e3d375c (author-owned COMMENTED approval review); cleanly rebased onto origin/main 41ea75e preserving /api/attached-sessions, relocates status projection helpers into loopx/chat/status_api.py without compat shims, slims loopx/chat_server.py to 1786 lines (any_count 25 -> 16) retiring its >2000-line ceiling, matches baseline parity (digest 23cfd81cc56e1678), and passes chat/architecture pytest suites, loopx-chat-server-smoke, ruff, mypy, typecheck:control-plane, and canary premerge quick (pre-existing unrelated main failures independently reproduced).
|
This pull request has merge conflicts with Choose the remote for the base repository, not an out-of-date fork. git fetch upstream
git rebase upstream/main
# Resolve each conflict, git add the resolved files, then git rebase --continue.
git push --force-with-lease origin HEADFor a same-repository clone whose Keep the DCO |
…ate chat_server, and retire ceiling Signed-off-by: LoopX Agent <337587101+loopx-agent@users.noreply.github.com>
e3d375c to
4c2fb18
Compare
loopx-agent
left a comment
There was a problem hiding this comment.
Reviewer: model_agent · Gemini · Google DeepMind · self_reported
Approval conclusion (author-owned PR; GitHub blocks formal self-approval)
已针对 PR #8908 变基后 exact head 4c2fb1806c89a47a5061ff171f2ae16598dc42b9(基线 origin/main 477def5c176ab4df92ac19ea1dd616828b325e87)完成逐行源码审查、跨基线行为等价性实测、Change-Quality Qualification 收据核验与本地全套验证(审查结论:APPROVE,无 P0/P1/P2 阻断项)。
动机 / Motivation
依赖 loopx_chat_status_v0 状态投影与 Chat HTTP 服务入口的运行时调用方、本地维护者,以及维护 loopx/canary/module_metric_baseline.json 模块体量棘轮的贡献者。 当主干持续向 loopx/chat_server.py 合入新路由与动作派发投影(例如 /api/attached-sessions 与 project_task_dispatch)时,滞留于传输层的状态投影构建器与重复样板代码使该模块长期高于两千行可维护性阈值并阻塞棘轮收敛。
变基前主干 477def5c17 中 loopx/chat_server.py 膨胀至 2,000 行以上并保留 lines: 2058、any_count: 25 棘轮豁免,将本应归属于既有状态所有者 loopx/chat/status_api.py 的四个状态投影构建器滞留在 HTTP 传输层内,且 ChatRequestHandler 多处重复编写查询参数裁剪、Goal 注册表读取、Goal Channel 错误包装、动作空体校验、失败写回与路径切分;变基整理后 4c2fb1806c 将纯状态投影迁入 loopx/chat/status_api.py(539 行),同步清理无用兼容垫片并收敛传输层重复样板,使 loopx/chat_server.py 降至 1,795 行、any_count=16。
整仓 4 个修改文件净减 95 行(+291/-386),loopx/chat_server.py 退出 >2,000 行棘轮豁免并将 any_count 收紧至 16,同时完整保留主干新增的 GET /api/attached-sessions、project_task_dispatch 动作派发投影及 runtime_source_root 资源校验;跨基线对拍指纹同为 c2e4c4db9cfefd6a,本地 Chat/Control-Plane/Canary 测试、smoke、ruff、loopx check、CQR 收据与 canary premerge --tier quick 均通过。
本 PR 仅处理状态投影向既有 loopx/chat/status_api.py 的职责归位、传输层局部去重及模块棘轮上限退役,不引入兼容重导出垫片,不更改 HTTP 路由、状态码、schema_version 载荷字段或 monkeypatch 契约,不修复主干既有未触及模块 interaction_contract.py 的 mypy 报错,亦不授予自动合入权限。
改动思路 / Approach
本次重构围绕单所有者收敛与最小可验证边界展开,对比了“维持现状继续依赖 2,058 行豁免”、“新建独立投影模块”与“迁入既有 loopx/chat/status_api.py”三种方案:维持现状无法解除模块体积膨胀与重复逻辑维护成本,新建模块则会打破 ChatStatusRequestMixin 的单一状态所有者边界;因此将 loopx_chat_status_v0 投影构建器整体迁入 loopx/chat/status_api.py,同步更新唯一外部调用方 examples/loopx-chat-server-smoke.py,不在 loopx/chat_server.py 保留兼容重导出垫片。
状态投影构建器属于 projection 职责且应直接归属既有状态所有者 loopx/chat/status_api.py(与 ChatStatusRequestMixin 同处一模块,仅在 build_chat_status_projection 内部保留函数级延迟导入 ..chat_server._goal_public_context 以规避环依赖并维持测试 monkeypatch 点);loopx/chat_server.py 提取的 _query_text、_load_registry_and_goal、_send_goal_channel_packet、_read_empty_action_body、_mark_action_failed 与 _run_action_mutation 均属于 local_helper,未引入任何新状态字段、新默认策略、权限模型或跨模块兼容层,可审查且可独立回退。
本 PR 严格收敛于 loopx/chat/status_api.py、loopx/chat_server.py、examples/loopx-chat-server-smoke.py 与 loopx/canary/module_metric_baseline.json 四个文件内的所有权归位、局部去重与棘轮豁免退役,并与主干最新的 project_task_dispatch、runtime_source_root 及 /api/attached-sessions 正交共存。
- 循环依赖与可测性权衡:
build_chat_status_projection函数内保留from ..chat_server import _goal_public_context延迟导入,既避免status_api与chat_server发生模块级环导入,又保证现有单测对loopx.chat_server._goal_public_context的 monkeypatch 依然生效。 - 主干变更完整保留:变基合入过程中解决
ChatRequestHandler._action_list冲突时完整保留主干新增的[self.server.action_service.project_task_dispatch(item) for item in proposals](_action_snapshot与_action_list均一致保留),同时保留serve_chat的runtime_source_root资源校验与GET /api/attached-sessions路由。
具体改动 / Changes
本 PR 在 exact head 4c2fb1806c89a47a5061ff171f2ae16598dc42b9 相对 origin/main 477def5c176ab4df92ac19ea1dd616828b325e87 共修改 4 个文件(+291 / -386,净减 95 行)。本维护性重构无独立成文规格(spec_basis: no_spec),遵循仓库既有 loopx/canary/module_metric_baseline.json 的 2,000 行模块棘轮约定以及 loopx.chat.status_api 单一状态接口所有者设计。
| 文件 | 变更量 | 角色分类 | 改动摘要 |
|---|---|---|---|
loopx/chat_server.py |
+127 / -382(1,795 行) |
生产代码(传输层瘦身与去重) | 迁出旧状态投影函数并移除无用 state_projection 导入;新增 _query_text、_load_registry_and_goal、_send_goal_channel_packet、_read_empty_action_body、_mark_action_failed、_run_action_mutation;do_GET/do_POST 单次切分 parts;serve_chat 复用 lark_cli_cmd;保留 project_task_dispatch 与 runtime_source_root |
loopx/chat/status_api.py |
+161 / -0(539 行) |
生产代码(状态投影归位) | 补充 registry_goals、resolve_state_file、build_active_state_structured_projection 导入;承接 _compact_status_text、_compact_todo、_goal_todos、build_chat_status_projection 与 build_bounded_chat_status_projection |
loopx/canary/module_metric_baseline.json |
+2 / -3 |
构建/棘轮配置 | 删除 loopx/chat_server.py 的 "lines": 2058 豁免并将 "any_count" 从 25 下调至 16 |
examples/loopx-chat-server-smoke.py |
+1 / -1 |
示例与端到端 smoke | L219 将 build_bounded_chat_status_projection 切换为直接从 loopx.chat.status_api 导入 |
关键代码讲解
loopx/chat/status_api.py:428-488—build_chat_status_projection:将队列态loopx_chat_status_v0投影构建器从chat_server.py移至status_api.py,函数首行延迟导入..chat_server._goal_public_context避免循环引用并保留外部 patch 点;由于queue_by_goal仅收纳dict元素且默认回退{},item恒为dict,移除原函数中不可达的else分支后逐字段输出与基线严格一致。loopx/chat/status_api.py:491-539—build_bounded_chat_status_projection:迁入status_api.py并直接委托同模块build_chat_status_projection,仅从本地STATE.md构建受限首屏状态;全仓检索确认除examples/loopx-chat-server-smoke.py(已同步更新)外无任何代码或测试从旧模块导入该符号。loopx/chat_server.py:1212-1271—_read_empty_action_body/_mark_action_failed/_run_action_mutation/_action_cancel/_action_transition:收敛动作变更接口的空 JSON 请求体校验与 404/409/400 错误映射;_action_transition通过transitions分派表保留regenerate -> 201、reject/defer -> 200及未知动作 400unsupported action transition,_action_apply保留 409ProtectedActionGate与 424canonical_action_failed语义并复用_read_empty_action_body与_mark_action_failed,同时_action_list保留了主干的project_task_dispatch映射。loopx/chat_server.py:1040-1043, 1369-1580—_send_goal_channel_packet与do_GET/do_POST单次路径切分:将_goal_channel_setup与_goal_channel_configure的失败回填和 200/400 返回收口至_send_goal_channel_packet;do_GET与do_POST入口各计算一次parts = path.strip("/").split("/")替代多处重复切分,完整保持路由匹配优先级与 404/409 响应契约。
对主干的风险 / Risks
- 调用方断链与模块度量检查(PASS):全仓检索
loopx/、tests/、examples/、apps/与scripts/确认无任何遗留代码从loopx.chat_server导入已迁移的 4 个状态投影符号;实测module_metrics显示loopx/chat_server.py为lines=1795, any_count=16, dict_any_count=0,loopx/chat/status_api.py为lines=539, any_count=21, dict_any_count=0,均满足默认阈值与棘轮约束。 - 跨基线行为等价性与负向路径对拍(PASS):在隔离临时环境中对比
origin/main(477def5c176ab4df92ac19ea1dd616828b325e87)与当前 exact head(4c2fb1806c89a47a5061ff171f2ae16598dc42b9),覆盖build_bounded_chat_status_projection、chat_server._goal_public_contextmonkeypatch 透传,以及真实 loopbackChatHTTPServer路由(GET /api/attached-sessions、GET /api/actions?status=pending、GET /api/actions/missing-id、POST /api/actions/missing-id/cancel空体与非空体、POST /api/actions/missing-id/bogus、POST /api/actions/missing-id/regenerate非空体、POST /api/actions/missing-id/apply空体与非空体、POST /api/chat/goal-channel/setup与configure非法体),归一化响应 SHA-256 指纹同为c2e4c4db9cfefd6a(PARITY_MATCH_OK),且确认loopx.chat_server不再残留兼容属性。 - 本地验证矩阵与既有基线说明(exact head
4c2fb1806c89a47a5061ff171f2ae16598dc42b9):- Chat 核心与会话/状态/架构/动作/棘轮套件:
879 passed(20 个核心test_chat_*/test_attached_session_broker.py等文件)+221 passed(15 个 canary/architecture/control_plane 文件)+50 passed(tests/control_plane/test_chat_cold_source_import.py顺序复跑通过;注:-n auto并发下有 2 例触发该测试文件既有非原子write_text竞态)+584 passed与46/46 passed(20 个 task-dispatch/collaboration/chat 路由套件,其中test_packaged_chat_http_user_completion6 例在挂载本地已构建loopx/web/chat资产后全过)+249 passed与49 passed(12 个 Goal-channel 与 presentation API 套件,后 2 文件顺序复跑全过):PASS。 - 端到端 smoke 与静态门禁:
examples/loopx-chat-server-smoke.py(挂载本地loopx/web/chat资产)输出loopx-chat-server-smoke: ok(PASS);ruff check变更 Python 文件全绿(PASS);npm run -s typecheck:control-plane通过(PASS);loopx check --scan-path ...4 个文件errors=0, warnings=0(PASS);CQR 收据cqr_e52e9a5075c44ed16171验证有效(decision=pass);canary premerge --tier quick --from-git-diff --git-diff-base origin/main --goal-id personal-loopx-maintenance通过(ok=true,merge_gate_passed=true,direct_failure_count=0,run_failure_count=0,manual_hold_count=0,quality_receipt_failure_count=0,含control-plane-maintainability-ratchet-smoke、semantic-vocabulary-drift-smoke、catalog-planner-smoke、check_rfc_bilingual.py):PASS。 mypy基线归因(pre_existing_unrelated,required=false):uv run --extra test mypy仅检查pyproject.toml固定的 17 个无关文件,在未改动origin/main(477def5c176ab4df92ac19ea1dd616828b325e87)与当前 head(4c2fb1806c89a47a5061ff171f2ae16598dc42b9)均报完全相同的 1 条错(loopx/control_plane/work_items/interaction_contract.py:1004arg-type,相同错误签名sha256:292e07e2383351db15c1cb581311cd02cd4dabbced31e4bfb42435961185bcb8),与本次改动无关。远端 GitHub CI 按当前 Goal 配置wait_for_ci: false未查询或等待(UNVERIFIED诊断态)。
- Chat 核心与会话/状态/架构/动作/棘轮套件:
语义与 CI 对齐
本 PR 不引入或修改任何 Enum、Literal、封闭词表或协议 schema(scripts/generate_semantic_inventory.py --changed-from origin/main 报 supported candidates: 0,candidate_decision: "reuse_existing"),仅依据 loopx/canary/module_metric_baseline.json 棘轮契约退役 loopx/chat_server.py 的 lines: 2058 豁免并收紧 any_count 至 16,同步遵循 loopx.chat.status_api 单一状态所有者约定。examples/semantic-vocabulary-drift-smoke.py 与 canary premerge --tier quick 均已在本地通过;远端 CI 按 wait_for_ci: false 策略未予咨询。
我的整体评价 / Verdict
- Long-horizon 影响:
improved— 消除loopx/chat_server.py超两千行豁免并降至 1,795 行(any_count25 -> 16),将纯状态投影收拢回既有所有者loopx/chat/status_api.py并去除 HTTP handler 重复控制流,降低后续演进耦合与审查成本。 - User-experience 影响:
preserved— 保留全部 HTTP 路由(含主干/api/attached-sessions与project_task_dispatch)、状态码、schema_version载荷字段与ChatRequestHandlermonkeypatch 接缝;visual_review为not_applicable(原因:本变更仅涉及 Python 模块loopx/chat_server.py、loopx/chat/status_api.py、examples/loopx-chat-server-smoke.py与配置文件loopx/canary/module_metric_baseline.json,未改动apps/presentation/前端渲染、页面组件或终端视觉输出。;unverified_scope:none)。 - 可观测语义 / 复用 / 权限 / 词表:
observable_semantics为equivalent(基线与当前 head 对拍指纹均为c2e4c4db9cfefd6a);repository_reuse为reused;code_volume为necessary(无兼容垫片,净减 95 行);default_off_isolation与authority_semantics均为not_applicable;semantic_alignment为aligned(reuse_existing)。 - 剩余风险与声明:唯一架构耦合为
build_chat_status_projection函数内延迟导入chat_server._goal_public_context(为兼容现有单测 patch 点所保留),且未执行远端全仓 CI;全部相关单测、端到端 chat-server smoke、静态检查、公共边界扫描、CQR 收据与canary premerge --tier quick在 exact head4c2fb1806c89a47a5061ff171f2ae16598dc42b9均已验证通过,满足审查批准标准(本 PR 为作者自有且触及loopx/**运行时模块,正式合入仍需维护者权限决策)。
English verdict: APPROVE exact head 4c2fb18 (author-owned COMMENTED approval review); cleanly rebased onto origin/main 477def5 preserving /api/attached-sessions, project_task_dispatch, and runtime_source_root, relocates status projection helpers into loopx/chat/status_api.py without compat shims, slims loopx/chat_server.py to 1795 lines (any_count 25 -> 16) retiring its >2000-line ceiling, matches base-vs-head parity (digest c2e4c4db9cfefd6a), and passes chat/control-plane/canary pytest suites, loopx-chat-server-smoke, ruff, typecheck:control-plane, loopx check, CQR cqr_e52e9a5075c44ed16171, and canary premerge quick.
Summary
Slims
loopx/chat_server.pyfrom2,037lines to1,776lines (-261lines;any_count25 -> 16), retires its>2,000-line waiver inloopx/canary/module_metric_baseline.json, movesloopx_chat_status_v0status projection helpers cleanly intoloopx/chat/status_api.py, and achieves-101net lines (+292/-393) across 4 modified files without changing runtime HTTP behavior or test monkeypatch seams.Delivery Brief
module_metric_ceilingsretirement for>2,000-line Python modules under the maintainability ratchet).loopx/chat_server.pycarried a2,058-line ceiling and25Anycount while housing pureloopx_chat_status_v0status-projection builders alongsideChatStatusRequestMixin(already owned byloopx/chat/status_api.py), alongside duplicated route segment splitting, Goal-channel error formatting, registry+goal loading, and typed action request/mutation wrappers insideChatRequestHandler.loopx/chat_server.pydrops from2,037to1,776lines (-261lines) andany_countdrops from25to16;"lines": 2058is retired and"any_count"is ratcheted to16inloopx/canary/module_metric_baseline.json._compact_todo,_goal_todos,build_chat_status_projection, andbuild_bounded_chat_status_projectionmove toloopx/chat/status_api.py(with lazy_goal_public_contextlookup insidebuild_chat_status_projectionto prevent circular imports and preserve test monkeypatching), andexamples/loopx-chat-server-smoke.pyimports directly fromloopx.chat.status_apiwith zero compatibility re-export shims left inloopx/chat_server.py._load_registry_and_goal,_query_text,_send_goal_channel_packet,_read_empty_action_body,_mark_action_failed,_run_action_mutation, single-passpartssplitting indo_GET/do_POST, andlark_cli_cmdresolution inserve_chat, delivering-101net lines (292 insertions(+), 393 deletions(-)) across the 4 touched files (d6fce1705c).loopx/chat/status_api.pyownsChatStatusRequestMixinand status-projection builders;loopx/chat_server.pyowns the loopback HTTP server/handler transport and monkeypatchable service wiring seams.schema_versionpayloads, error messages, andchat_servermonkeypatch targets.Verification
uv run --extra test python -m pytest tests/test_chat_internal_module_layout.py tests/test_chat_status_owner.py tests/test_chat_server_cors.py tests/test_chat_lark_api_contract.py tests/test_chat_agent_model_http.py tests/test_chat_codex_home.py tests/test_chat_transport_composition.py tests/test_chat_turn_steering.py tests/test_chat_startup_isolation.py tests/test_chat_startup_options.py tests/test_chat_path_redaction.py tests/test_chat_http_runtime_scope.py -q->361 passed in 198.38suv run --extra test python -m pytest tests/test_chat_todo_detail.py tests/test_chat_image_http.py tests/test_chat_process_recovery.py tests/presentation/test_openai_keys.py tests/presentation/test_background_services_api.py tests/presentation/test_research_analysis_api.py -q->98 passed, 1 pre-existing failure(test_http_recheck_starts_existing_owners_once_and_preserves_disabled_features, verified failing identically on unmodifiedorigin/main42483ac371)uv run --extra test python examples/loopx-chat-server-smoke.py(with staged local chat web assets) ->loopx-chat-server-smoke: okuv run --extra test ruff check loopx/chat_server.py loopx/chat/status_api.py examples/loopx-chat-server-smoke.py->All checks passed!uv run --extra test python examples/control_plane/control-plane-maintainability-ratchet-smoke.py->control-plane-maintainability-ratchet: ok(unreviewed: 0, stale_exceptions: 0, magnitude_regressions: 0)uv run --extra test python examples/semantic-vocabulary-drift-smoke.py->semantic-vocabulary-drift-smoke: okuv run --extra test python examples/cli-control-plane-command-modularization-smoke.py->cli-control-plane-command-modularization-smoke: okuv run --extra test python scripts/check_rfc_bilingual.py --base origin/main --head HEAD->RFC bilingual diff check passed.uv run --extra test loopx check --scan-path ...across all 4 modified files ->ok: true, errors: 0