refactor(detection): consolidate on version_flag/version_command, remove duplication

- Replace version_args with existing version_flag field
- Implement support for both version_flag and version_command from catalog
- Add version_flag to curlie, go, gam catalog entries
- Remove hardcoded special cases for go, gam, git-absorb (now catalog-driven)
- Preserve complex special cases (entr, fx, docker-compose)

Fixes design issue where version_flag and version_command existed in catalog
but were never implemented, leading to duplicate version_args field and
continued hardcoded special cases.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: CybotTM

audit.py

@@ -124,15 +124,17 @@ def audit_tool(tool: Tool, offline_cache: dict[str, tuple[str, str]] | None = No
     # Load catalog metadata for version detection
     from cli_audit.catalog import ToolCatalog
     catalog = ToolCatalog()
-    version_args = None
+    version_flag = None
+    version_command = None
     if catalog.has_tool(tool.name):
         catalog_data = catalog.get_raw_data(tool.name)
-        version_args = catalog_data.get("version_args")
+        version_flag = catalog_data.get("version_flag")
+        version_command = catalog_data.get("version_command")
 
     # Detect installed version
     deep_scan = tool.name in {"node", "python", "semgrep", "pre-commit", "bandit", "black", "flake8", "isort"}
     version_num, version_line, path, install_method = audit_tool_installation(
-        tool.name, tool.candidates, deep=deep_scan, version_args=version_args
+        tool.name, tool.candidates, deep=deep_scan, version_flag=version_flag, version_command=version_command
     )
 
     installed = version_num if version_num else (version_line if version_line != "X" else "")

catalog/curlie.json

@@ -5,7 +5,7 @@
   "homepage": "https://github.com/rs/curlie",
   "github_repo": "rs/curlie",
   "binary_name": "curlie",
-  "version_args": ["version"],
+  "version_flag": "version",
   "download_url_template": "https://github.com/rs/curlie/releases/download/{version}/curlie_{version_nov}_linux_{arch}.tar.gz",
   "arch_map": {
     "x86_64": "amd64",

catalog/gam.json

@@ -5,6 +5,7 @@
   "homepage": "https://github.com/GAM-team/GAM",
   "github_repo": "GAM-team/GAM",
   "binary_name": "gam",
+  "version_flag": "version",
   "package_name": "gam7",
   "notes": "Version detected via uv tool list. Binary requires googleapiclient dependencies and cannot run standalone for version check."
 }

catalog/go.json

@@ -4,6 +4,7 @@
   "description": "Go programming language",
   "homepage": "https://go.dev",
   "binary_name": "go",
+  "version_flag": "version",
   "script": "install_go.sh"
   ,"guide": {
     "display_name": "Go toolchain",

cli_audit/detection.py

@@ -144,37 +144,49 @@ def extract_version_number(s: str) -> str:
     return m2.group(1) if m2 else ""
 
 
-def get_version_line(path: str, tool_name: str, version_args: list[str] | None = None) -> str:
+def get_version_line(path: str, tool_name: str, version_flag: str | None = None, version_command: str | None = None) -> str:
     """Get version string for installed tool.
 
     Args:
         path: Path to executable
         tool_name: Tool name for special-case handling
-        version_args: Custom version arguments from catalog (e.g., ["version"])
+        version_flag: Custom version flag/arg from catalog (e.g., "version", "--version")
+        version_command: Custom shell command from catalog (ignores path)
 
     Returns:
         Version line string or empty string
     """
-    # If catalog specifies custom version args, use them first
-    if version_args:
-        line = run_with_timeout([path] + version_args)
+    # Priority 1: If catalog specifies custom shell command, run it directly
+    if version_command:
+        try:
+            proc = subprocess.run(
+                version_command,
+                shell=True,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.DEVNULL,
+                stdin=subprocess.DEVNULL,
+                text=True,
+                timeout=TIMEOUT_SECONDS,
+                check=False,
+                env={**os.environ, "TERM": "dumb"},
+            )
+            line = (proc.stdout or "").strip()
+            if line:
+                return line
+        except Exception:
+            pass
+
+    # Priority 2: If catalog specifies custom version flag, use it
+    if version_flag:
+        line = run_with_timeout([path, version_flag])
         if line:
             return line
 
-    # Special cases
-    if tool_name == "go":
-        line = run_with_timeout([path, "version"])
-        return line if line else ""
-
+    # Priority 3: Special cases (only truly complex cases that can't be handled by catalog)
     if tool_name == "sponge":
-        # sponge reads stdin and can block
+        # sponge reads stdin and can block - catalog has version_command to query dpkg
         return "installed"
 
-    if tool_name == "git-absorb":
-        # git-absorb outputs WARN messages without --version flag
-        line = run_with_timeout([path, "--version"])
-        return line if line else ""
-
     if tool_name == "docker-compose":
         base = os.path.basename(path)
         if base == "docker":
@@ -228,13 +240,6 @@ def get_version_line(path: str, tool_name: str, version_args: list[str] | None =
                     pass
         return "installed"
 
-    if tool_name == "gam":
-        # gam often has import errors - try version command specifically
-        line = run_with_timeout([path, "version"])
-        if line and not line.startswith("Traceback"):
-            return line
-        return ""
-
     # Generic version flags
     for flags in VERSION_FLAG_SETS:
         line = run_with_timeout([path, *flags])
@@ -322,15 +327,16 @@ def choose_highest(candidates: list[tuple[str, str, str]]) -> tuple[str, str, st
 
 
 def audit_tool_installation(
-    tool_name: str, candidates: tuple[str, ...], deep: bool = False, version_args: list[str] | None = None
+    tool_name: str, candidates: tuple[str, ...], deep: bool = False, version_flag: str | None = None, version_command: str | None = None
 ) -> tuple[str, str, str, str]:
     """Audit a single tool's installation.
 
     Args:
         tool_name: Tool name
         candidates: Binary names to search for
         deep: If True, find all installations
-        version_args: Custom version arguments from catalog (e.g., ["version"])
+        version_flag: Custom version flag from catalog (e.g., "version", "--version")
+        version_command: Custom shell command from catalog
 
     Returns:
         Tuple of (version_num, version_line, path, install_method)
@@ -339,7 +345,7 @@ def audit_tool_installation(
 
     for cand in candidates:
         for path in find_paths(cand, deep=deep):
-            line = get_version_line(path, tool_name, version_args)
+            line = get_version_line(path, tool_name, version_flag, version_command)
             if line:
                 num = extract_version_number(line)
                 tuples.append((num, line, path))