Skip to content

Fix council doctor subcommand check for CLIs with non-zero --help exit #13

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
antunesand merged 1 commit into from
Feb 17, 2026
Merged

Fix council doctor subcommand check for CLIs with non-zero --help exit #13

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
12 changes: 10 additions & 2 deletions src/council/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,10 @@ def _probe_tool_version(cmd: str) -> str | None:
def _check_subcommand(full_cmd: list[str]) -> bool:
"""Check if a subcommand exists by running it with --help.

E.g. ``["codex", "exec", "--help"]``. Returns True if exit code is 0.
E.g. ``["codex", "exec", "--help"]``. Returns True when the help
text is produced — some CLIs (notably ``codex exec``) return a
non-zero exit code even for ``--help``, so we also accept output
that contains typical help keywords.
"""
try:
result = subprocess.run(
Expand All @@ -744,7 +747,12 @@ def _check_subcommand(full_cmd: list[str]) -> bool:
text=True,
timeout=5,
)
return result.returncode == 0
if result.returncode == 0:
return True
# Fallback: treat as valid if stdout/stderr contains help-like text.
output = (result.stdout or "") + (result.stderr or "")
lower = output.lower()
return any(kw in lower for kw in ("usage:", "options:", "commands:", "--help"))
except (FileNotFoundError, subprocess.TimeoutExpired, OSError):
return False

Expand Down