Skip to content

整合审阅:UI 两批优化、GitHub 监控后台恢复与 NextFlux 阅读修复 - #23

Merged
gkeyes merged 20 commits into
codex/refactor-lightweight-v2from
codex/fix-watcher-background-20260922
Sep 22, 2026
Merged

gkeyes merged 20 commits into
codex/refactor-lightweight-v2from
codex/fix-watcher-background-20260922

Conversation

@gkeyes

@gkeyes gkeyes commented Sep 22, 2026 •

Copy link
Copy Markdown
Owner

已完成:审核、合并与仅保留默认分支

按用户明确授权完成,合并提交 6688b85e973e2cf70703c893c2c387bcce3bfff5,默认分支仍为 codex/refactor-lightweight-v2,没有改名或强制覆盖。

最终审阅 HEAD:d3764581f020cd90e32338df54fa27ba7113adfd;合并后源码树与其完全相同:d6c5cd1e465051e36b9b76035e558dae5993376f。

保留的工作及历史

  • 原默认分支:cf08609012bda1cf3e74109b6402ffe074bca324。
  • 公共组件、第一/第二批页面 UI 优化:83b90e0e0633774b3c42b35b93176a6c7e147b44。PR UI polish: 公共组件、高频流程与次级页面打磨 #22 已由 GitHub 自动识别为合并并关闭。
  • 宿主后台 WebView 受控恢复及 watcher 请求/轮询修复:3c0795bc7912afb0f30fdcc71d3d54da3e4bfb10。
  • NextFlux 1.0.12 图片尺寸/手势和测试等独立工作:b02196c4fe14840ce99e26dac1a0a2ae31a6cf8c。未把未合入的独立提交直接删除。

审核发现并修正

  1. 解决四处 watcher 源码合并冲突,保留新版 UI 与后台修复。
  2. 修复停止监控后,后台时钟异步续体仍可能开始发送结果通知的竞态;入口与循环检查当前监控/代次,新增实际函数回归。
  3. watcher 更新为 1.1.2 / versionCode 13;TBX 名称重新从 manifest 版本生成,避免写死旧版本。
  4. 保留宿主完整安装身份、后台权限/恢复选项、有限退避与次数上限,以及停止/撤权取消恢复和旧 WebView 回调隔离。
  5. 清理失效的分支限定签名、导出与临时整合工作流,检查整合到 Android/TBX 工作流。Android 模拟器及签名启动测试默认 NOT RUN,只有手动显式启用才运行;未运行不伪装通过,不复用不匹配的旧证据。原密钥、包名、R8 和嵌入资源检查保留。
  6. 修正旧网页布局测试夹具的启动匹配、reliability.js 静态资源和直接构建 ID 查询模拟;保留全部原布局、操作与边界断言,不删除测试或降低标准。

最终合并前的实际验证

均针对审阅 HEAD d376458,而不是旧分支构建结果:

  • Android CI 35719096803:Debug/Release 编译、JVM/JS、接口/资源/发布证据检查及产物上传成功。
  • TBX 35719096792:所有选定小工具打包及 watcher/NextFlux 检查成功。
  • Watcher layout 35719096773:浏览器布局和交互检查成功。
    Android UI/模拟器与签名启动检查未运行,不据此宣称真机后台、锁屏、切网、视觉或性能已全面验收。无本地 Android 编译或签名。

分支清理证据

清理运行 35719951791 成功。先校验完整祖先关系、预期 HEAD、默认源码树一致性,再通过精确 SHA 租约与一次原子操作删除:

  • codex/ui-polish-emil-20260922
  • codex/nextflux-reading-1.0.12
  • codex/fix-watcher-background-20260922

用于清理的最后一笔提交只含一次性管理工作流,不含 App 修改;该工作流未进入默认分支。删除后 API 回读只有默认分支,HEAD 仍为 6688b85;开放 PR 列表为空。标签与已有 Release 未删除。

默认分支交付

合并已触发默认分支 Android CI 35719833932,按原证书生成 Release;此说明不提前宣称该次签名已完成。应用仍为 io.toolbox.host / 0.8.5 (38),原证书 SHA-256:849be1fd8066964d6194faa538fc0b17b4b17e5c116304e1d3be8ff725e4c71d。
未发布新的公开 GitHub Release。

Apply Emil-inspired design polish to the existing Compose components:
- Measure toolbar controls before laying out titles, including RTL and large text.
- Keep search geometry stable and expose focused state without hidden controls.
- Defer navigation animation reads to placement and drawing, preserving hit targets.
- Clarify settings rows and make disclosure feedback interruptible.
- Add parameterized Android behavior regressions for six appearance variants.

Preserve public component APIs, existing materials, runtime behavior and dependencies.
Android compilation and behavior verification are delegated to the existing PR CI.
Settle initial content before freezing the clock, advance a frame after each
click before checking semantics, and restore clock state in finally.
Preserve all theme cases and rapid retargeting assertions; additionally
verify that all three click events are delivered and the final state holds.

Fixes the six disclosure test failures in Android CI run 35676762827.
…nagement lists

Prioritize favorites, compact catalog sorting and empty states, display verified manifest descriptions through the existing icon cache, open the actual imported tool, share confirmation content without replacing dialog hosts, and emit management rows as keyed lazy items.

Preserve the branch-only Android UI test waiver, original signing workflows, app identity, permissions, package validation, and runtime behavior. Add JVM import-target state regressions; no emulator tests added.
…aries

Clarify group selection and unsaved edits, streamline appearance settings with a live token preview, show per-tool host grant summaries, prioritize backup actions and restore counts, and make browser address actions directly accessible.

Keep original permission defaults and mutation paths, backup consent and rollback, browser security controls, app identity, dependency graph and branch-only emulator waiver. Add JVM regressions for draft changes, restore summaries and permission counts.
Preserve existing secondary-page changes and wire the cached tool name into loading and exit feedback without a new catalog subscription. Keep runtime readiness, WebView lifetime, navigation timing and confirmation behavior unchanged.

Use indeterminate feedback rather than a fabricated percentage. Keep short errors and startup warnings visible, while long runtime diagnostics retain their first reason and full selectable details. Preserve old composable signatures and add six JVM presentation regressions.

No changes to dependencies, permissions, database, package identity, version, signing or emulator-test policy.
Keep the installed stage-two host UI, port the actual watcher 1.1.0 presentation, and release watcher 1.1.1 (12). Bound native GitHub requests and polling leases, fence late responses, prioritize tracked run IDs and incremental discovery, decouple ETA learning, and post terminal notifications without artificial delay.

Recreate only eligible opted-in background runtimes after renderer/entry failure, with full identity/permission checks, three bounded attempts and explicit interrupted status. Fence old WebView callbacks and view release, cancel recovery on stop/revoke/replacement, and preserve reboot/process opt-ins.

Add 13 JS fault-injection and 10 JVM recovery regressions, with a branch-only Actions build. No emulator tests, no original signing changes, no default-branch update.
…changes

Preserve complete histories of the current default, both UI batches, background runtime repair, and independent NextFlux 1.0.12 branch. Resolve four watcher-source conflicts without reverting its newer UI or recovery logic.

Fix stopped clock continuations posting completion notifications; release watcher 1.1.2 (13), restore manifest-driven package naming, and add the stopped-session regression. Keep original app identity and release certificate.

Consolidate verification into Android/TBX workflows and remove temporary branch-only signing/export jobs. Default to the user's requested no-Android-emulator mode, retain opt-in full checks, and report unexecuted startup checks as NOT_RUN with fail-closed current-commit evidence guards. Preserve JVM, JS, browser-layout and package tests.

Reviewed final source tree: 361315e. CI on this integrated source is still required before merging the default branch.
@gkeyes gkeyes changed the title fix: GitHub 构建守望 1.1.1 与宿主后台异常恢复 整合审阅:UI 两批优化、GitHub 监控后台恢复与 NextFlux 阅读修复 Sep 22, 2026
@gkeyes
gkeyes changed the base branch from codex/ui-polish-emil-20260922 to codex/refactor-lightweight-v2 September 22, 2026 10:56
@gkeyes
gkeyes marked this pull request as ready for review September 22, 2026 10:57
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Sep 22, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-09-22T11:03:59.181781Z 4335e3f Draft marked ready
ℹ️ 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@gkeyes gkeyes left a comment

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

审核结论:已处理本轮发现的合并阻塞项

审核对象为最终 HEAD d3764581f020cd90e32338df54fa27ba7113adfd,源码树 d6c5cd1e465051e36b9b76035e558dae5993376f。

  • 保留 UI 两批、宿主后台异常恢复、小工具 1.1.1 的可靠性修复和 NextFlux 1.0.12 独立提交的完整历史,未用旧分支覆盖默认分支后续工作。
  • 处理四处 watcher 合并冲突;修复停止后时钟异步回调仍可能进入结果通知的竞态,新增停止回归。watcher 现为 1.1.2 (13),包文件名重新从 manifest 生成。
  • 校验宿主恢复的权限、完整安装身份、恢复选择、有限重试以及撤权/停止取消路径;不增加强制保活或绕过保护措施。
  • 清理已失效的分支签名/导出工作流;普通构建保留 JVM/JS/API/资源检查,Android 模拟器与签名启动检查按用户要求默认 NOT RUN,显式手动开启才运行;原证书和优化检查保留,新增证据范围防误标测试。
  • 整合后布局测试首次因旧启动夹具匹配失败,已仅修正测试加载入口、reliability.js 资产和按构建 ID 查询的桥接夹具,保留全部布局/操作断言。

当前提交的实际检查:Android CI 35719096803 构建与单元检查成功,TBX CI 35719096792 成功,Watcher layout 35719096773 成功。PR 的正式签名任务正常跳过,需合并到默认分支后按原密钥生成。

没有在用户手机进行锁屏/切网/后台长时间存活实测;Android UI 与启动测试未运行,不将代码检查和构建成功等同全部体验验收。依据用户本轮授权,现可合并当前精确 HEAD,随后只删除已保留源码历史的非默认分支。

@gkeyes
gkeyes merged commit 6688b85 into codex/refactor-lightweight-v2 Sep 22, 2026
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant