Conversation
The auto-merge combined dev-fix's orjson-based todo tests with dev-020's import header (json only); the missing import made 22 verification-gate / regression tests fail with NameError.
…heduler The subprocess-env guard (test_subprocess_env_guard) flags raw os.environ.copy() spawn sites; the merged line uses build_subprocess_env() which preserves the exact legacy behavior while scrubbing secrets.
The merged feishu adapter kept the lazy-load design (module __getattr__ + _lark_bindings) but the conflict resolution dropped check_feishu_requirements. Re-added it with the check-only semantics (tools.lazy_deps.ensure, no SDK import/bind) that tests/gateway/test_feishu_lazy_import.py and the platform connected-checker guard expect; actual SDK imports stay lazy.
The merged adapter kept dev-fix's lazy module design (no module-level None placeholders; __getattr__ + _lark_bindings) but the auto-merged static request builders used dev-020's 'if X is not None:' guard, which NameErrors when the SDK names are unbound (module __getattr__ does not fire for direct global references inside the module). Converted the 14 static builder guards to dev-fix's '"X" in globals()' pattern so they fall back to SimpleNamespace until the SDK is actually bound.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
变更
dev-fix重放到当前origin/main@933efec173，使main成为分支的直接祖先，PR 仅包含 9 个重放提交。dev-020历史，避免错误重放 4258 个旧提交。dev-fix中的终端/进程易用性、RTK 命令重写、便携运行时、cron、飞书懒加载、系统提示精简、Todo API 与相关测试调整。FORK_NOTES；保留现有 P-059/P-060，并把新增终端补丁登记为唯一的 P-061。原因
dev-fix同时包含旧上游历史、已压缩进入主线的dev-020，以及后续新增提交。直接执行普通 rebase 会生成 4258 个待重放提交，既不符合实际差异，也会污染 PR 历史。影响
本 PR 让最新
dev-fix变更基于当前主线接受 CI 验证，同时不重复引入已经进入main的dev-020内容。验证
git merge-base --is-ancestor origin/main HEAD：通过。git rev-list --left-right --count origin/main...HEAD：0 9。dev-fixSHA 已核对为711315c510045ab68d2c7ac05206f9e1fcc17177。git diff --check origin/main...HEAD：未通过，发现 14 个来自原分支内容的文件末尾新增空行；按要求暂未修改，交由本 PR 的 CI 进一步确认。