feat: update CLI to manage all RHDH repos dynamically

Generalize status, doctor, and config commands to iterate over all repos
from SUBMODULE_REPOS instead of hardcoding overlay/local/factory checks.

Update SKILL.md config examples to show all available repo keys.
Add .rhdh/ to .gitignore for the new config directory.

Author: kadel

.gitignore

@@ -31,4 +31,5 @@ Thumbs.db
 .python-version
 
 # Local config (project-specific settings)
+.rhdh/
 .rhdh-plugin/

skills/rhdh/SKILL.md

@@ -165,10 +165,17 @@ $RHDH doctor
 **Configuration:**
 
 ```bash
-$RHDH config init              # Create config with auto-detection
-$RHDH config show              # Show resolved paths
-$RHDH config set overlay /path # Set repo location
-$RHDH config set local /path   # Set rhdh-local location
+$RHDH config init                  # Create config with auto-detection
+$RHDH config show                  # Show resolved paths
+$RHDH config set overlay /path     # Set rhdh-plugin-export-overlays location
+$RHDH config set local /path       # Set rhdh-local location
+$RHDH config set rhdh /path        # Set main rhdh repo location
+$RHDH config set downstream /path  # Set rhdh-downstream location
+$RHDH config set cli /path         # Set rhdh-cli location
+$RHDH config set plugins /path     # Set rhdh-plugins location
+$RHDH config set operator /path    # Set rhdh-operator location
+$RHDH config set chart /path       # Set rhdh-chart location
+$RHDH config set catalog /path     # Set rhdh-plugin-catalog location
 ```
 
 **Workspace operations:**

skills/rhdh/rhdh/cli.py

@@ -19,10 +19,9 @@
 from .config import (
     SUBMODULE_REPOS,
     get_data_dir,
-    get_factory_repo,
     get_github_username,
-    get_local_repo,
     get_overlay_repo,
+    get_repo,
     list_submodule_repos,
     save_github_username,
     setup_submodule,
@@ -97,89 +96,45 @@ def cmd_status(fmt: OutputFormatter, _args: argparse.Namespace) -> int:
     next_steps: list[str] = []
     needs_setup = False
 
-    # Check overlay repo
-    overlay_repo = get_overlay_repo()
-    if overlay_repo:
-        branch = get_git_branch(overlay_repo)
-        status = "uncommitted" if has_uncommitted_changes(overlay_repo) else "clean"
-        checks.append(
-            {
-                "name": "overlay_repo",
-                "status": "pass",
-                "message": f"{overlay_repo} ({branch}, {status})",
-                "path": str(overlay_repo),
-                "branch": branch,
-                "clean": status == "clean",
-            }
-        )
-        fmt.log_ok(f"overlay repo: {overlay_repo} ({branch}, {status})")
-    else:
-        checks.append(
-            {
-                "name": "overlay_repo",
-                "status": "fail",
-                "message": "not found",
-            }
-        )
-        fmt.log_fail("overlay repo: not found")
-        needs_setup = True
-
-    # Check rhdh-local
-    local_repo = get_local_repo()
-    if local_repo:
-        # Check if running (podman)
-        running = False
-        if check_tool("podman"):
-            rc, stdout, _ = run_command(["podman", "ps", "--format", "{{.Names}}"])
-            running = rc == 0 and "rhdh" in stdout
-
-        status_msg = "running" if running else "not running"
-        check_status = "pass" if running else "warn"
-        checks.append(
-            {
-                "name": "rhdh_local",
-                "status": check_status,
-                "message": f"{local_repo} ({status_msg})",
-                "path": str(local_repo),
-                "running": running,
-            }
-        )
-        if running:
-            fmt.log_ok(f"rhdh-local: {local_repo} (running)")
-        else:
-            fmt.log_warn(f"rhdh-local: {local_repo} (not running)")
-    else:
-        checks.append(
-            {
-                "name": "rhdh_local",
-                "status": "fail",
-                "message": "not found",
-            }
-        )
-        fmt.log_fail("rhdh-local: not found")
-        needs_setup = True
+    # Check all configured repos
+    for repo_name, info in SUBMODULE_REPOS.items():
+        config_key = info["config_key"]
+        required = info["required"]
+        repo_path = get_repo(config_key)
 
-    # Check factory (optional)
-    factory_repo = get_factory_repo()
-    if factory_repo:
-        checks.append(
-            {
-                "name": "factory",
-                "status": "pass",
-                "message": str(factory_repo),
-                "path": str(factory_repo),
-            }
-        )
-        fmt.log_ok(f"factory: {factory_repo}")
-    else:
-        checks.append(
-            {
-                "name": "factory",
-                "status": "info",
-                "message": "not configured (optional)",
-            }
-        )
-        fmt.log_info("factory: not configured (optional)")
+        if repo_path:
+            branch = get_git_branch(repo_path)
+            status = "uncommitted" if has_uncommitted_changes(repo_path) else "clean"
+            checks.append(
+                {
+                    "name": config_key,
+                    "status": "pass",
+                    "message": f"{repo_path} ({branch}, {status})",
+                    "path": str(repo_path),
+                    "branch": branch,
+                    "clean": status == "clean",
+                }
+            )
+            fmt.log_ok(f"{config_key}: {repo_path} ({branch}, {status})")
+        elif required:
+            checks.append(
+                {
+                    "name": config_key,
+                    "status": "fail",
+                    "message": "not found",
+                }
+            )
+            fmt.log_fail(f"{config_key}: not found")
+            needs_setup = True
+        else:
+            checks.append(
+                {
+                    "name": config_key,
+                    "status": "info",
+                    "message": "not configured (optional)",
+                }
+            )
+            fmt.log_info(f"{config_key}: not configured (optional)")
 
     # Check tools
     fmt.header("Tools")
@@ -279,56 +234,38 @@ def cmd_doctor(fmt: OutputFormatter, _args: argparse.Namespace) -> int:
     checks: list[dict[str, Any]] = []
     issues: list[str] = []
 
-    # Check repos
-    overlay_repo = get_overlay_repo()
-    if overlay_repo:
-        checks.append({"name": "overlay_repo", "status": "pass", "message": str(overlay_repo)})
-        fmt.log_ok(f"Overlay repo found: {overlay_repo}")
+    # Check all repos
+    for repo_name, info in SUBMODULE_REPOS.items():
+        config_key = info["config_key"]
+        required = info["required"]
+        repo_path = get_repo(config_key)
 
-        # Check it's a git repo
-        rc, _, _ = run_command(["git", "rev-parse", "--git-dir"], cwd=overlay_repo)
-        if rc == 0:
-            checks.append({"name": "overlay_git", "status": "pass", "message": "valid"})
-            fmt.log_ok("  Git repository valid")
-        else:
-            checks.append({"name": "overlay_git", "status": "fail", "message": "invalid"})
-            fmt.log_fail("  Not a valid git repository")
-            issues.append("Overlay repo is not a git repository")
+        if repo_path:
+            checks.append({"name": config_key, "status": "pass", "message": str(repo_path)})
+            fmt.log_ok(f"{config_key} found: {repo_path}")
 
-        # Check remote
-        rc, stdout, _ = run_command(["git", "remote", "get-url", "origin"], cwd=overlay_repo)
-        if rc == 0:
-            remote = stdout.strip()
-            if "rhdh-plugin-export-overlays" in remote:
-                checks.append({"name": "overlay_remote", "status": "pass", "message": remote})
-                fmt.log_ok(f"  Remote: {remote}")
+            # Check it's a git repo
+            rc, _, _ = run_command(["git", "rev-parse", "--git-dir"], cwd=repo_path)
+            if rc == 0:
+                checks.append(
+                    {"name": f"{config_key}_git", "status": "pass", "message": "valid"}
+                )
+                fmt.log_ok("  Git repository valid")
             else:
-                checks.append({"name": "overlay_remote", "status": "warn", "message": remote})
-                fmt.log_warn(f"  Remote may be incorrect: {remote}")
-    else:
-        checks.append({"name": "overlay_repo", "status": "fail", "message": "not found"})
-        fmt.log_fail("Overlay repo not found")
-        issues.append("Configure overlay repo: rhdh config set overlay /path/to/repo")
-
-    local_repo = get_local_repo()
-    if local_repo:
-        checks.append({"name": "rhdh_local", "status": "pass", "message": str(local_repo)})
-        fmt.log_ok(f"rhdh-local found: {local_repo}")
-
-        # Check compose file exists
-        has_compose = (local_repo / "compose.yaml").exists() or (
-            local_repo / "docker-compose.yaml"
-        ).exists()
-        if has_compose:
-            checks.append({"name": "compose_file", "status": "pass", "message": "found"})
-            fmt.log_ok("  Compose file found")
+                checks.append(
+                    {"name": f"{config_key}_git", "status": "fail", "message": "invalid"}
+                )
+                fmt.log_fail("  Not a valid git repository")
+                issues.append(f"{config_key} is not a git repository")
+        elif required:
+            checks.append({"name": config_key, "status": "fail", "message": "not found"})
+            fmt.log_fail(f"{config_key} not found")
+            issues.append(f"Configure {config_key}: rhdh config set {config_key} /path/to/repo")
         else:
-            checks.append({"name": "compose_file", "status": "warn", "message": "not found"})
-            fmt.log_warn("  No compose file found")
-    else:
-        checks.append({"name": "rhdh_local", "status": "fail", "message": "not found"})
-        fmt.log_fail("rhdh-local not found")
-        issues.append("Configure rhdh-local: rhdh config set local /path/to/repo")
+            checks.append(
+                {"name": config_key, "status": "info", "message": "not configured (optional)"}
+            )
+            fmt.log_info(f"{config_key}: not configured (optional)")
 
     fmt.header("GitHub CLI")
 
@@ -479,14 +416,14 @@ def cmd_config_init(fmt: OutputFormatter, args: argparse.Namespace) -> int:
         fmt.log_ok(f"Created: {data.get('created', '')}")
         config = data.get("config", {})
         repos = config.get("repos", {})
-        if repos.get("overlay"):
-            fmt.log_ok(f"Auto-detected overlay: {repos['overlay']}")
-        else:
-            fmt.log_info("overlay: not found (configure with: rhdh config set repos.overlay /path)")
-        if repos.get("local"):
-            fmt.log_ok(f"Auto-detected local: {repos['local']}")
-        else:
-            fmt.log_info("local: not found (configure with: rhdh config set repos.local /path)")
+        for info in SUBMODULE_REPOS.values():
+            key = info["config_key"]
+            if repos.get(key):
+                fmt.log_ok(f"Auto-detected {key}: {repos[key]}")
+            elif info["required"]:
+                fmt.log_info(
+                    f"{key}: not found (configure with: rhdh config set {key} /path)"
+                )
         fmt.success(data, next_steps=next_steps)
         return 0
     else:
@@ -511,18 +448,14 @@ def cmd_config_show(fmt: OutputFormatter, args: argparse.Namespace) -> int:
 
         fmt.header("Resolved Paths")
         resolved = data.get("resolved", {})
-        if resolved.get("overlay"):
-            fmt.log_ok(f"overlay: {resolved['overlay']}")
-        else:
-            fmt.log_fail("overlay: not found")
-        if resolved.get("local"):
-            fmt.log_ok(f"local: {resolved['local']}")
-        else:
-            fmt.log_fail("local: not found")
-        if resolved.get("factory"):
-            fmt.log_ok(f"factory: {resolved['factory']}")
-        else:
-            fmt.log_info("factory: not configured")
+        for info in SUBMODULE_REPOS.values():
+            key = info["config_key"]
+            if resolved.get(key):
+                fmt.log_ok(f"{key}: {resolved[key]}")
+            elif info["required"]:
+                fmt.log_fail(f"{key}: not found")
+            else:
+                fmt.log_info(f"{key}: not configured")
 
         fmt.success(data, next_steps=next_steps)
         return 0

tests/conftest.py

@@ -224,12 +224,12 @@ def unconfigured_cli(isolated_env, monkeypatch):
     """Fixture providing CLI with no repos configured.
 
     Use this to test the "needs setup" state without manual monkeypatching.
-    Mocks get_overlay_repo and get_local_repo to return None.
+    Mocks get_repo to return None for all repos.
     """
     from rhdh import cli as cli_module
 
     monkeypatch.setattr(cli_module, "get_overlay_repo", lambda: None)
-    monkeypatch.setattr(cli_module, "get_local_repo", lambda: None)
+    monkeypatch.setattr(cli_module, "get_repo", lambda key: None)
 
     def _run_cli(*args, env=None):
         full_env = {}

tests/e2e/test_cli.py

@@ -56,21 +56,15 @@ def test_status_shows_next_steps(self, cli, isolated_env):
         assert response is not None
         assert "next_steps" in response
 
-    def test_status_needs_setup_points_to_doctor(self, unconfigured_cli):
-        """When needs_setup is true, status should point to doctor command.
-
-        Doctor command has all the setup guidance - status just redirects there.
-        """
+    def test_status_unconfigured_is_valid(self, unconfigured_cli):
+        """When no repos are configured, needs_setup should be false (all repos are optional)."""
         result = unconfigured_cli()
 
         response = parse_response(result)
         assert response is not None
-        assert response["data"]["needs_setup"] is True
-
-        # next_steps should include doctor command
-        assert "rhdh doctor" in response["next_steps"]
+        assert response["data"]["needs_setup"] is False
 
-        # Should NOT include setup_options or doctor_workflow (that's doctor's job)
+        # Should NOT include setup_options or doctor_workflow
         assert "setup_options" not in response["data"]
         assert "doctor_workflow" not in response["data"]
 
@@ -106,26 +100,31 @@ def test_doctor_returns_all_passed(self, cli, isolated_env):
         assert response is not None
         assert "all_passed" in response["data"]
 
-    def test_doctor_points_to_workflow_when_issues_found(self, unconfigured_cli):
-        """When doctor finds issues, it should point to the workflow file.
+    def test_doctor_checks_all_repos(self, unconfigured_cli):
+        """Doctor should include a check for every configured repository."""
+        from rhdh.config import SUBMODULE_REPOS
 
-        This enables agents to read the workflow for remediation steps.
-        """
         result = unconfigured_cli("doctor")
-
         response = parse_response(result)
         assert response is not None
-        assert response["data"]["all_passed"] is False
 
-        # Should include workflow path for agentic discovery
-        assert "workflow" in response["data"]
-        assert response["data"]["workflow"] == "workflows/doctor.md"
+        check_names = [c["name"] for c in response["data"]["checks"]]
+        for info in SUBMODULE_REPOS.values():
+            config_key = info["config_key"]
+            assert config_key in check_names, (
+                f"Doctor missing check for repo '{config_key}'"
+            )
+
+    def test_doctor_unconfigured_repos_no_issues(self, unconfigured_cli):
+        """When no repos are configured, doctor should not report repo issues (all optional)."""
+        result = unconfigured_cli("doctor")
 
-        # Should include instruction for agent
-        assert "agent_instruction" in response["data"]
+        response = parse_response(result)
+        assert response is not None
 
-        # next_steps should point to reading the workflow
-        assert any("workflow" in step.lower() for step in response["next_steps"])
+        # No repo-related issues should appear (all repos are optional)
+        repo_issues = [i for i in response["data"]["issues"] if "config set" in i]
+        assert repo_issues == [], f"Unexpected repo issues: {repo_issues}"
 
 
 class TestCliConfig: