Skip to content

fix: 恢复 master CI 全绿——ftxui gitlink 同步 + verify_package_contract 两处 #35 引入缺陷 #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LIUXIN557 merged 2 commits into from
Sep 2, 2026
Merged

fix: 恢复 master CI 全绿——ftxui gitlink 同步 + verify_package_contract 两处 #35 引入缺陷 #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3521b1d
fix(verify-package): 修复 PR #35 引入的 verify_package_contract 两个预存在失败
slyxyllt Sep 2, 2026
bbe7320
fix(submodule): 同步 external/ftxui 至 f98588b4，修复 master 构建（EnableMouse…
slyxyllt Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 23 additions & 15 deletions .acecode/skills/verify-package/scripts/verify_package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,23 +376,31 @@ def probe_desktop(report: Report, staged: Path, platform: str,
shutil.rmtree(home, ignore_errors=True)
return
deadline = time.monotonic() + launch_timeout
while time.monotonic() < deadline:
if process.poll() is None:
report.add("desktop launch", "pass",
f"alive after launch (pid {process.pid}); terminating")
process.terminate()
try:
process.wait(timeout=15)
except subprocess.TimeoutExpired:
process.kill()
shutil.rmtree(home, ignore_errors=True)
return
while time.monotonic() < deadline and process.poll() is None:
time.sleep(0.25)
if process.poll() == 0:
report.add("desktop launch", "fail", "exited immediately with code 0")
if process.poll() is None:
# Process survived the entire launch window: treat startup as
# successful, then stop it.
report.add("desktop launch", "pass",
f"alive after launch (pid {process.pid}); terminating")
process.terminate()
try:
process.wait(timeout=15)
except subprocess.TimeoutExpired:
process.kill()
else:
report.add("desktop launch", "fail",
f"exited with code {process.returncode} during startup")
# Process exited at any point inside the window, including exit code 0.
# Verdicts must wait out the window instead of passing on the first
# poll() is None: right after spawn an immediately-exiting process
# (e.g. an `exit 0` stub) can still report poll() is None and would be
# wrongly marked "alive" (TOCTOU race). Waiting the full window makes
# the immediate-exit detection deterministic.
code = process.returncode
if code == 0:
report.add("desktop launch", "fail", "exited immediately with code 0")
else:
report.add("desktop launch", "fail",
f"exited with code {code} during startup")
shutil.rmtree(home, ignore_errors=True)


Expand Down
38 changes: 23 additions & 15 deletions .agents/skills/verify-package/scripts/verify_package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,23 +376,31 @@ def probe_desktop(report: Report, staged: Path, platform: str,
shutil.rmtree(home, ignore_errors=True)
return
deadline = time.monotonic() + launch_timeout
while time.monotonic() < deadline:
if process.poll() is None:
report.add("desktop launch", "pass",
f"alive after launch (pid {process.pid}); terminating")
process.terminate()
try:
process.wait(timeout=15)
except subprocess.TimeoutExpired:
process.kill()
shutil.rmtree(home, ignore_errors=True)
return
while time.monotonic() < deadline and process.poll() is None:
time.sleep(0.25)
if process.poll() == 0:
report.add("desktop launch", "fail", "exited immediately with code 0")
if process.poll() is None:
# Process survived the entire launch window: treat startup as
# successful, then stop it.
report.add("desktop launch", "pass",
f"alive after launch (pid {process.pid}); terminating")
process.terminate()
try:
process.wait(timeout=15)
except subprocess.TimeoutExpired:
process.kill()
else:
report.add("desktop launch", "fail",
f"exited with code {process.returncode} during startup")
# Process exited at any point inside the window, including exit code 0.
# Verdicts must wait out the window instead of passing on the first
# poll() is None: right after spawn an immediately-exiting process
# (e.g. an `exit 0` stub) can still report poll() is None and would be
# wrongly marked "alive" (TOCTOU race). Waiting the full window makes
# the immediate-exit detection deterministic.
code = process.returncode
if code == 0:
report.add("desktop launch", "fail", "exited immediately with code 0")
else:
report.add("desktop launch", "fail",
f"exited with code {code} during startup")
shutil.rmtree(home, ignore_errors=True)


Expand Down
38 changes: 23 additions & 15 deletions .claude/skills/verify-package/scripts/verify_package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,23 +376,31 @@ def probe_desktop(report: Report, staged: Path, platform: str,
shutil.rmtree(home, ignore_errors=True)
return
deadline = time.monotonic() + launch_timeout
while time.monotonic() < deadline:
if process.poll() is None:
report.add("desktop launch", "pass",
f"alive after launch (pid {process.pid}); terminating")
process.terminate()
try:
process.wait(timeout=15)
except subprocess.TimeoutExpired:
process.kill()
shutil.rmtree(home, ignore_errors=True)
return
while time.monotonic() < deadline and process.poll() is None:
time.sleep(0.25)
if process.poll() == 0:
report.add("desktop launch", "fail", "exited immediately with code 0")
if process.poll() is None:
# Process survived the entire launch window: treat startup as
# successful, then stop it.
report.add("desktop launch", "pass",
f"alive after launch (pid {process.pid}); terminating")
process.terminate()
try:
process.wait(timeout=15)
except subprocess.TimeoutExpired:
process.kill()
else:
report.add("desktop launch", "fail",
f"exited with code {process.returncode} during startup")
# Process exited at any point inside the window, including exit code 0.
# Verdicts must wait out the window instead of passing on the first
# poll() is None: right after spawn an immediately-exiting process
# (e.g. an `exit 0` stub) can still report poll() is None and would be
# wrongly marked "alive" (TOCTOU race). Waiting the full window makes
# the immediate-exit detection deterministic.
code = process.returncode
if code == 0:
report.add("desktop launch", "fail", "exited immediately with code 0")
else:
report.add("desktop launch", "fail",
f"exited with code {code} during startup")
shutil.rmtree(home, ignore_errors=True)


Expand Down
38 changes: 23 additions & 15 deletions .codex/skills/verify-package/scripts/verify_package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,23 +376,31 @@ def probe_desktop(report: Report, staged: Path, platform: str,
shutil.rmtree(home, ignore_errors=True)
return
deadline = time.monotonic() + launch_timeout
while time.monotonic() < deadline:
if process.poll() is None:
report.add("desktop launch", "pass",
f"alive after launch (pid {process.pid}); terminating")
process.terminate()
try:
process.wait(timeout=15)
except subprocess.TimeoutExpired:
process.kill()
shutil.rmtree(home, ignore_errors=True)
return
while time.monotonic() < deadline and process.poll() is None:
time.sleep(0.25)
if process.poll() == 0:
report.add("desktop launch", "fail", "exited immediately with code 0")
if process.poll() is None:
# Process survived the entire launch window: treat startup as
# successful, then stop it.
report.add("desktop launch", "pass",
f"alive after launch (pid {process.pid}); terminating")
process.terminate()
try:
process.wait(timeout=15)
except subprocess.TimeoutExpired:
process.kill()
else:
report.add("desktop launch", "fail",
f"exited with code {process.returncode} during startup")
# Process exited at any point inside the window, including exit code 0.
# Verdicts must wait out the window instead of passing on the first
# poll() is None: right after spawn an immediately-exiting process
# (e.g. an `exit 0` stub) can still report poll() is None and would be
# wrongly marked "alive" (TOCTOU race). Waiting the full window makes
# the immediate-exit detection deterministic.
code = process.returncode
if code == 0:
report.add("desktop launch", "fail", "exited immediately with code 0")
else:
report.add("desktop launch", "fail",
f"exited with code {code} during startup")
shutil.rmtree(home, ignore_errors=True)


Expand Down
2 changes: 1 addition & 1 deletion external/ftxui
Open in desktop
Submodule ftxui updated 5 files
+37 −0 ACECODE_PATCHES.md
+1 −1 CMakeLists.txt
+10 −0 include/ftxui/component/app.hpp
+43 −9 src/ftxui/component/app.cpp
+42 −0 src/ftxui/component/app_test.cpp
7 changes: 5 additions & 2 deletions tests/scripts/verify_package_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
Loading