chore(submodule): 前移 external/ftxui 至 f98588b4(FTXUI PR #2 hover motion) - #37
Closed
LIUXIN557 wants to merge 3 commits into
Closed
chore(submodule): 前移 external/ftxui 至 f98588b4(FTXUI PR #2 hover motion)#37LIUXIN557 wants to merge 3 commits into
LIUXIN557 wants to merge 3 commits into
Conversation
FTXUI PR #2(opt-in mouse hover motion, DEC 1003)已合并进 shaohaozhi286/FTXUI:main(merge commit 7eb56df3;f98588b4 已是 main 历史祖先)。前移 ACECode 的 external/ftxui gitlink 658c942c → f98588b4, 使 feat/tui-hyperlinks 分支现在可独立编译(src/main.cpp 调用的 EnableMouseHoverMotion 来自该补丁)。ports/ftxui port-version 已在 5.x 一并 bump 至 4,vcpkg ABI hash 已刷新。
tests/scripts/verify_package_test.sh 的 darwin app bundle 用例先用 mkdir -p
创建了 .../share/acecode/seed 目标目录,随后执行
cp -R "$fixture/assets/seed" .../share/acecode/seed
由于目标目录已存在,cp -R 会把源目录复制为目标目录下的同名子目录,
实际布局变成 seed/seed/{MANIFEST.json,seed.version,skills/demo/SKILL.md},
与 assets/seed 比对时产生 missing + unexpected,校验器只回传最后一行
unexpected,表现为:
[FAIL] seed bundle (app bundle): seed bundle unexpected: seed/skills/demo/SKILL.md
改为复制目录内容(cp -R src/. dst/),使 app bundle 内 seed 布局与
assets/seed 一致。该失败自 verify_package_contract 引入(PR #35)起在
master 上即为 pre-existing,与子模块指针变更无关。
验证:以同一 fixture 对比两种写法,旧写法 FAIL(1 of 9),新写法 PASS(9 checks)。
LIUXIN557
pushed a commit
that referenced
this pull request
Sep 2, 2026
…HoverMotion) master 经 #36 合入 0b97e49(TUI 超链接增强 5.1-5.3)后,src/main.cpp 调用了 ftxui::App::EnableMouseHoverMotion / EnableSynchronizedOutput 等新 API,但 external/ftxui 的 gitlink 仍停留在 658c942c——该版本 ftxui 无 EnableMouseHoverMotion 成员,导致 linux-x64 CI 在 Build CLI and test binary 步骤失败(error: class ftxui::App has no member named EnableMouseHoverMotion), master 处于构建红态(Merge #36 run 33653685659 同一步失败,为 pre-existing)。 前移至 f98588b4(FTXUI PR #2 hover motion,已确认合入 shaohaozhi286/FTXUI main,任意机器 clone 可及;与 #37 分支 ae67486 指向一致)。
Collaborator
Author
|
PR #38 (fix/verify-package-desktop-probe) 已合并进 master,本 PR 的全部内容已被覆盖:
此时若再合并本 PR 会把 master 的 TOCTOU 修复回退掉(本分支 verify_package.py 为旧版),故关闭而非合并。功能已全部经 PR #38 落地。 |
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
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.
背景
TUI 超链接增强(点击打开 / OSC8 透传 / 悬停气泡)的应用侧代码已合入 master(commit 0b97e49),其中
src/main.cpp调用了 FTXUI 新增的ftxui::App::EnableMouseHoverMotion(opt-in DEC 1003 hover motion)。该方法来自已合并的 FTXUI PR #2(shaohaozhi286/FTXUI#2,merge commit 7eb56df3;f98588b4 已是 main 历史祖先)。master 当前编译不过:master 已含调用方代码,但
external/ftxui仍停在658c942c,Linux CI 报src/main.cpp:4929: error: 'class ftxui::App' has no member named 'EnableMouseHoverMotion'(见 PR #36 的 run 33653685659)。本 PR 即修复该编译断裂。本 PR 做了什么
external/ftxuigitlink658c942c → f98588b4(1 行)—— 让 master 恢复可编译,悬停气泡/OSC8 透传路径完整可用。verify_package_contract契约测试的误报(tests/scripts/verify_package_test.sh)。关于第 2 项(与子模块无关,但是 CI 全绿的必要条件)
tests/scripts/verify_package_test.sh的 darwin app bundle 用例先用mkdir -p创建了.../share/acecode/seed目标目录,随后执行:由于目标目录已存在,
cp -R会把源目录复制为目标目录下的同名子目录,实际布局变成seed/seed/{MANIFEST.json,seed.version,skills/demo/SKILL.md},与assets/seed比对时产生 missing + unexpected;而校验器只回传最后一行,表现为:改为复制目录内容(
cp -R src/. dst/),使 app bundle 内 seed 布局与assets/seed一致。该失败自
verify_package_contract引入(PR #35)起在 master 上即为 pre-existing,与本 PR 的子模块变更无关(证据:PR #35 的 run 33653587072 报同样的seed bundle unexpected: seed/skills/demo/SKILL.md)。验证方式:以同一 fixture 对比两种写法——旧写法
FAIL (1 of 9 checks),新写法PASS (9 checks)。关联
验证
Build CLI and test binary通过(证明 gitlink 前移修复了 master 的编译断裂);Run ctest3809 个测试中仅verify_package_contract失败,现已由本 PR 第 2 项修复。GTEST_FILTER排除两个 master pre-existing abort 测试(RemoteWebTcpProxy.* / SettingsMutations.*)后全跑,9 FAILED 全部为 master pre-existing(network/pty/browser/statefile/settings,macOS 12 本地环境),本次变更零回归。