diff --git a/app/runtime/extensions/plugin/catalog.py b/app/runtime/extensions/plugin/catalog.py index 5a2739bcb..f08884366 100644 --- a/app/runtime/extensions/plugin/catalog.py +++ b/app/runtime/extensions/plugin/catalog.py @@ -62,7 +62,7 @@ class PluginCatalogFacade: if not plugin_market: return [] markets = split_plugin_market_repo_urls(plugin_market) - result = self._market_catalog().collect( + result: list[Plugin] = self._market_catalog().collect( markets=markets, compatible_flags=self._system().compatible_flags( get_runtime_setting('VERSION_FLAG') @@ -261,7 +261,8 @@ class PluginCatalogFacade: force: bool = False, ) -> list[Plugin]: """读取并映射指定插件市场。""" - return self._market_catalog().load(market, package_version, force) + plugins: list[Plugin] = self._market_catalog().load(market, package_version, force) + return plugins async def async_online( self, @@ -275,7 +276,7 @@ class PluginCatalogFacade: progress_callback(value=100, text="未配置插件市场,跳过刷新") return [] markets = split_plugin_market_repo_urls(plugin_market) - result = await self._market_catalog().async_collect( + result: list[Plugin] = await self._market_catalog().async_collect( markets=markets, compatible_flags=self._system().compatible_flags( get_runtime_setting('VERSION_FLAG') @@ -311,17 +312,19 @@ class PluginCatalogFacade: force: bool = False, ) -> list[Plugin]: """异步读取并映射指定插件市场。""" - return await self._market_catalog().async_load( + plugins: list[Plugin] = await self._market_catalog().async_load( market, package_version, force, ) + return plugins def merge(self, higher: list[Plugin], base: list[Plugin]) -> list[Plugin]: """合并不同代际插件目录并保留市场优先级。""" plugin_market = get_runtime_setting('PLUGIN_MARKET') markets = split_plugin_market_repo_urls(plugin_market) - return self._market_catalog().merge(higher, base, markets) + plugins: list[Plugin] = self._market_catalog().merge(higher, base, markets) + return plugins def _safe_state(self, plugin_id: str, plugin: Any) -> bool: """读取插件状态,单个插件异常不阻断整个本地目录。""" diff --git a/docs/code-quality.md b/docs/code-quality.md index f2f4feeaf..6bee94d6c 100644 --- a/docs/code-quality.md +++ b/docs/code-quality.md @@ -75,7 +75,7 @@ uv run --locked --no-sync python scripts/architecture/complexity.py 回调和返回值类型;全仓错误计数为零并不保证单独纳入 strict frontier 后也为零。 2026-10-16 开始逐文件清理类型债务,`app/domain/title.py` 通过局部可空类型声明保留 -既有搜索解析行为,并纳入严格清单;当前清单共 106 个文件(105 个生产文件和 1 个脚本)。 +既有搜索解析行为,并纳入严格清单;当前清单共 107 个文件(106 个生产文件和 1 个脚本)。 每个治理提交聚焦一个生产文件及其必要测试、门禁配置、真实下降基线和指标文档。 验收同时检查完整严格清单与全宿主 Linux 分析,避免 `follow_imports = skip` 隐藏依赖 签名冲突;不通过忽略诊断或放宽类型合同接受回退。最新文件清单以 `mypy.ini` 为准, diff --git a/docs/refactor/optimization-checklist.md b/docs/refactor/optimization-checklist.md index 273b52668..02fcef22c 100644 --- a/docs/refactor/optimization-checklist.md +++ b/docs/refactor/optimization-checklist.md @@ -106,9 +106,9 @@ ARCH-201 至 ARCH-204 均达到实现、验证、提交、推送和远端门禁 | Model/Oper 事务债务 | 0 | 自建 Session、自动事务装饰器、直接 commit/rollback 等基线均为零 | | Module Contract | 215 specs / 211 methods / 263 calls | 动态方法名为 0;分类事实富化通过显式合同进入插件调度,旧 YAML 分类方法已移除;download 新增 custom_words 可选参数,旧 provider 签名通过显式合同兼容 | | Event Contract | 53 | 均已有 payload model,但当前全部是 diagnostic enforcement | -| Python 源码量 | 372,319 行 | 本次重新扫描物理行数,排除 `app/plugins/**`;74 个文件超过 1,000 行,12 个超过 2,000 行;源码尺寸仅作观察 | +| Python 源码量 | 372,322 行 | 本次重新扫描物理行数,排除 `app/plugins/**`;74 个文件超过 1,000 行,12 个超过 2,000 行;源码尺寸仅作观察 | | 长方法 | 309 个超过 80 行 | 本次 AST 扫描排除 `app/plugins/**`;61 个超过 150 行,17 个超过 250 行;新增函数仍受 C901/嵌套深度门禁约束 | -| 全量 mypy 历史债务 | 8,806 / 448 文件 | 通知排版补齐 Slack 消息块类型,历史债务减少 2 项;工作流资源过滤改用领域对象调用过滤链,恢复的节点输出在消费前归一化,并收紧可空资源列表的类型低水位;消息媒体交互类型债务已清零,canonical Facade 与 endpoint 类型边界已补齐,低水位只允许继续下降;微信 ClawBot 入站 item_list 媒体解析改为按子项键名分派后,类型错误减少 4 项;站点解析器分享率改用浮点初值,类型错误减少 20 项;本次下载与文件安全修复再减少 3 项;Transmission 进度回退值归一化再减少 2 项,逐文件逐错误码无增长 | +| 全量 mypy 历史债务 | 8,801 / 447 文件 | 通知排版补齐 Slack 消息块类型,历史债务减少 2 项;工作流资源过滤改用领域对象调用过滤链,恢复的节点输出在消费前归一化,并收紧可空资源列表的类型低水位;消息媒体交互类型债务已清零,canonical Facade 与 endpoint 类型边界已补齐,低水位只允许继续下降;微信 ClawBot 入站 item_list 媒体解析改为按子项键名分派后,类型错误减少 4 项;站点解析器分享率改用浮点初值,类型错误减少 20 项;本次下载与文件安全修复再减少 3 项;Transmission 进度回退值归一化再减少 2 项,逐文件逐错误码无增长 | | Ruff 历史诊断 | 98 | 低水位门禁通过,但规则集只覆盖 `E4/E7/E9/F/I` | | 覆盖率固定基线 | Application 80.00%,Domain 80.00% | Chain、Runtime、Agent、Adapter、Startup 未进入包级覆盖率门禁 | diff --git a/mypy.ini b/mypy.ini index 7241fa2aa..80f62208e 100644 --- a/mypy.ini +++ b/mypy.ini @@ -54,6 +54,7 @@ files = app/runtime/extensions/module/quality.py, app/runtime/extensions/plugin/admission.py, app/runtime/extensions/plugin/access.py, + app/runtime/extensions/plugin/catalog.py, app/runtime/extensions/plugin/clone.py, app/runtime/extensions/plugin/lifecycle.py, app/runtime/extensions/plugin/metadata.py, diff --git a/tests/fixtures/architecture/mypy-baseline.json b/tests/fixtures/architecture/mypy-baseline.json index 5ec684e1d..c5aad4980 100644 --- a/tests/fixtures/architecture/mypy-baseline.json +++ b/tests/fixtures/architecture/mypy-baseline.json @@ -2297,9 +2297,6 @@ "attr-defined": 1, "type-arg": 4 }, - "app/runtime/extensions/plugin/catalog.py": { - "no-any-return": 5 - }, "app/runtime/extensions/plugin/manager.py": { "assignment": 4, "attr-defined": 1,