Skip to content

feat: preserve SecAgent integration - #259

Merged
lrsgzs merged 8 commits into
SECTL:masterfrom
PANDAJSR:codex/secrandom-secagent-http
Aug 9, 2026
Merged

feat: preserve SecAgent integration#259
lrsgzs merged 8 commits into
SECTL:masterfrom
PANDAJSR:codex/secrandom-secagent-http

Conversation

@PANDAJSR

@PANDAJSR PANDAJSR commented Aug 9, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Merge the latest SECTL/SecRandom changes into the SecAgent integration branch.
  • Preserve the OOBE navigation hang fix by disabling the animated Carousel transition.
  • Merge the newer StudentDrawExecutionPolicy draw path with automatic student-round reset.
  • Preserve the local SecAgent HTTP endpoint and connector auto-update bootstrap.

Conflict resolution

  • DrawEngine.cs: combined upstream execution policies with automatic reset after RepeatLimitExhausted.
  • FirstRunOobeWindow.axaml: kept upstream title-bar/grid layout while retaining the non-animated Carousel fix.
  • Plugin runtime and SecAgent connector files deleted by upstream were intentionally retained for the SecAgent integration.

Validation

  • No unresolved merge conflicts remain.
  • Full solution build is pending because this machine lacks the Android/iOS workloads required by the latest solution.

@PANDAJSR
PANDAJSR requested review from lrsgzs and lzy98276 August 9, 2026 04:47

@lrsgzs lrsgzs left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

请移除回归的插件部分内容。

Comment thread SecRandom/Views/FirstRunOobeWindow.axaml
@PANDAJSR

PANDAJSR commented Aug 9, 2026

Copy link
Copy Markdown
Contributor Author

已按审查意见移除回归的插件部分内容:删除旧插件运行时、SecAgent HTTP/自动安装服务及 App 注册,仅保留 OOBE 卡死修复与抽取自动重置逻辑。当前 PR 相对 SECTL/master 仅剩 3 个文件改动。

@lrsgzs

lrsgzs commented Aug 9, 2026

Copy link
Copy Markdown
Member
  1. 把 SecAgent 内容删了,这个pr有什么用
  2. 请撤销oobe相关修改
  3. DrawEngine的修改是为了什么。请检查编译是否能够通过。

继续提交低质量代码可能会延缓您的 PR 审核。

@PANDAJSR

PANDAJSR commented Aug 9, 2026

Copy link
Copy Markdown
Contributor Author

更正:已恢复 SecAgent 普通 HTTP 服务、插件自动安装/更新服务及 App 注册;仅移除审查所指的旧插件运行时回归部分。另外修复了 HTTP 服务直接 new DrawEngine() 的编译问题,改为通过 DI 注入合并后的 DrawEngine。

@PANDAJSR

PANDAJSR commented Aug 9, 2026

Copy link
Copy Markdown
Contributor Author

已按最新评论重新整理:本 PR 现在只增加 SecAgent 联动(普通 HTTP 服务、自动安装/更新服务及 App 注册),已撤销全部 OOBE 和 DrawEngine 修改,也未恢复旧插件运行时。最新 CI 已通过还原并进入 C# 构建阶段,正在等待最终 CodeQL 结果。

@lrsgzs lrsgzs changed the title fix: merge OOBE hang fixes and preserve SecAgent integration feat: preserve SecAgent integration Aug 9, 2026
@lrsgzs
lrsgzs merged commit ba668b1 into SECTL:master Aug 9, 2026
3 checks passed

@lrsgzs lrsgzs left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

looks good

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.

2 participants