Skip to content

diag(shell): 失败信息自动附带判读 (#73) #287

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
JavaZeroo merged 1 commit into from
Oct 31, 2026
Merged

diag(shell): 失败信息自动附带判读 (#73) #287

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion experiments/shell/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
ROOT = Path(__file__).resolve().parents[2]
sys.path.insert(0, str(ROOT))
from experiments.build_paths import binary
from experiments.shell import summarize_failure
from experiments.conpty.run import OwnedJob
from experiments.shell.history_checks import validate_history, validate_native_scroll
from experiments.shell.paste_checks import validate_paste_workflow
Expand Down Expand Up @@ -504,7 +505,15 @@ def execute(exe, mode, out, timeout=40, settings_source=None, *, resources=False
if not record["desktop_gone"]:
raise ValueError("owned desktop remained")
if mode != "watchdog" and (record["timed_out"] or record["exit_code"]):
raise ValueError("shell probe failed: " + record["stderr"].strip())
# Read the dump back with the shared parser so the raised message always
# carries the same verdict instead of a raw multi-line stderr (#73).
failures = summarize_failure.parse(record["stderr"])
summary = ""
if failures:
verdicts = summarize_failure.describe(failures[0])
if verdicts:
summary = " | " + "; ".join(verdicts)
raise ValueError("shell probe failed: " + record["stderr"].strip() + summary)
result = json.loads(record["stdout"])
if mode == "watchdog":
if not record["timed_out"] or result != {"watchdog_ready": True} or record["job_at_timeout"]["active"] < 2:
Expand Down