Repository navigation
fix(task): 补齐停止收尾确认 - #1891
fix(task): 补齐停止收尾确认#1891jinghero wants to merge 3 commits into
Conversation
Codex Review Summary: ✅ CompletedThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
总体结论：修改后合并AUTO-MAS-Project/AUTO-MAS #1891 宝宝，这次把关闭模拟器、关闭游戏和后置脚本放回统一停止确认里，确实补上了原来“还没收尾就禁止启动清理命令”的缺口喵。不过根收尾提前启动后，原有的超时取消保护漏接了一处，停止仍可能一直等下去，先把这处补齐再合。 旧专项桥接器负责安排停止顺序，进程作用域负责确认期限与统一回收，各专项继续执行自己的收尾；不需要再造一套清理流程。 [逻辑 · P2] 根收尾提前启动后，超时不会取消它位置：legacy.py:244–254、legacy.py:266–281、legacy.py:287–308。 静态追踪到的时序是：手动停止 → 更新确认通过 → execution_finalize 取消业务任务并等待完整收尾 → 根 finalizer 在作用域尚未关闭时登记。如果它等待的不是子进程，而是迟迟未返回的文件线程，10 秒后确认项虽然标记超时，却只取消了 shield 外面的等待任务。随后 force_close 回收子进程，统一取消又把 self._finalizer 留在 keep 中；外层再次取消业务任务也会被 TaskBase._wait_finalizer 的 shield 挡住。 这里有真实入口：MaaFW 托管收尾 在手动停止后仍会执行 audit_view 和日志备份清理的 to_thread 等待。文件 I/O 卡住时，进程强杀不会结束这些等待，停止操作就可能迟迟不能返回，任务也无法完成注销。此处不是声称实际复现。 原先根 final_task 先等停止检查结束，再登记收尾，此时 scope.closed 为真，watch_finalizer 会挂上有限取消计时器；现在登记提前了，而关闭作用域时没有给已登记的根收尾补上这层保护。 建议由旧专项停止编排补齐根 finalizer 的到期取消，或复用 scope 中已有登记在强清理时处理它，保留正常收尾的宽限和真实未完成工作原有的占用保护。验收再补一个“根收尾等待文件线程、没有子进程可杀”的场景：到期后停止能够返回，不能只靠杀掉进程让等待自然结束。现有超时回归等的是进程退出，覆盖不到这一支，猫爪子就按在这里啦。 本轮为静态源码与调用链审查，没有执行项目代码或测试。已核对新增回归的断言与既有停止保护；CI 状态以当前检查页为准，作者的本机验证不作为本轮独立执行结果。 —— dot酱敬上 🐾 |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 1b2fa8cf6f
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| "execution_finalize", | ||
| self._confirm_execution_stop, | ||
| timeout=self.owner.STOP_CHECK_TIMEOUTS["finalize"], | ||
| ) | ||
| await scope.run_checks() |
There was a problem hiding this comment.
When a MaaFW pretask refuses termination and the no-Job fallback kill also fails, this new phase releases the project reservation prematurely. _kill_pretask_process() logs and swallows termination errors, so MaaFWPluginAutoProxyTask._finalize_user() can continue to _release_project_path() despite the surviving process. Running that finalizer before scope.force_close() means cleanup_failed is recorded only after the reservation has been released, allowing another run or update to access the same project while the old pretask is still writing. Preserve the reservation until process termination is actually confirmed, including when unified cleanup fails.
Useful? React with 👍 / 👎.
摘要
关联 #1871。
验证
dev基线c3f6c11b6上 4 项失败，修复后通过；覆盖关闭命令、后置脚本、结果继续保存和同一项目再次取得预约。uv lock --check、更新日志碎片检查通过。