From ae67486c9fce68ec834120b34b6c36fcf60db0de Mon Sep 17 00:00:00 2001 From: slyxyllt Date: Thu, 3 Sep 2026 00:18:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?chore(submodule):=20=E5=89=8D=E7=A7=BB=20ex?= =?UTF-8?q?ternal/ftxui=20=E8=87=B3=20f98588b4=EF=BC=88FTXUI=20PR=20#2=20h?= =?UTF-8?q?over=20motion=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 已刷新。 --- external/ftxui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/ftxui b/external/ftxui index 658c942c..f98588b4 160000 --- a/external/ftxui +++ b/external/ftxui @@ -1 +1 @@ -Subproject commit 658c942c6eaceae88fd7ea4458ffa1f5a7775af7 +Subproject commit f98588b47b097674724100c7a35a3c9b8ec055e3 From 3b01afffc4593ea24851a7d72af9e017fc6c4a0a Mon Sep 17 00:00:00 2001 From: slyxyllt Date: Thu, 3 Sep 2026 01:00:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(tests):=20=E4=BF=AE=E5=A4=8D=20verify?= =?UTF-8?q?=5Fpackage=20=E5=A5=91=E7=BA=A6=E6=B5=8B=E8=AF=95=20seed=20?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E5=B5=8C=E5=A5=97=E5=AF=BC=E8=87=B4=E8=AF=AF?= =?UTF-8?q?=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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)。 --- tests/scripts/verify_package_test.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/scripts/verify_package_test.sh b/tests/scripts/verify_package_test.sh index 7e9298b6..b9d876cc 100644 --- a/tests/scripts/verify_package_test.sh +++ b/tests/scripts/verify_package_test.sh @@ -197,8 +197,11 @@ EOF chmod +x "$fixture/build/ACECode.app/Contents/MacOS/acecode-daemon" cp "$fixture/assets/models_dev/"* \ "$fixture/build/ACECode.app/Contents/Resources/share/acecode/models_dev/" - cp -R "$fixture/assets/seed" \ - "$fixture/build/ACECode.app/Contents/Resources/share/acecode/seed" + # The destination already exists (created by mkdir -p above), so plain + # `cp -R src dst` nests the tree as dst/seed instead of filling dst, which + # makes the packaged seed layout mismatch assets/seed. Copy the contents. + cp -R "$fixture/assets/seed/." \ + "$fixture/build/ACECode.app/Contents/Resources/share/acecode/seed/" expect_status 0 "darwin bundle flow" "$python_bin" "$verify_script" \ --skip-build --platform darwin --target desktop \ --repo "$fixture" --build-dir "$fixture/build" \