refactor(auto-fork): use runtime env vars + compress docs

Address PR review feedback:
- Auto-discover config dir from data/remote-config/*/agent/project-repos.json
- Extract instance_id from config dir name (e.g., rehor-config-instance1)
- Eliminate BOT_CONFIG_PATH and BOT_INSTANCE_ID env var requirements
- Update SKILL.md + README.md to reflect auto-discovery
- Update tests to create proper directory structure

Skills now auto-discover values instead of requiring bot to set extra env vars.

All tests pass (24/24).

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

Author: catastrophe-brandon

.claude/skills/auto-fork/README.md

@@ -29,14 +29,20 @@ python3 auto_fork.py --dry-run
 
 ## Configuration
 
-Environment variables (auto-provided by bot runtime):
+### Required Environment Variables
 
-- `GH_USER_NAME` — bot GitHub username
+- `GH_USER_NAME` — bot GitHub username (validated against GitHub username rules)
 - `GL_USER_NAME` — bot GitLab username
-- `BOT_CONFIG_PATH` — config directory (default `rehor-config`)
-- `BOT_INSTANCE_ID` — optional instance ID (affects branch name)
 
-The script validates that `GH_USER_NAME` follows GitHub username rules and will raise a `ValueError` early if validation fails.
+### Auto-Discovered Values
+
+The skill automatically discovers the following without requiring environment variables:
+
+- **Config directory**: Scans `data/remote-config/*/agent/project-repos.json` (bot runtime) or `<config-name>/agent/project-repos.json` (local dev)
+- **Instance ID**: Extracted from config directory name
+  - Pattern: `rehor-config-instance1` → instance ID = `instance1`
+  - Used for branch naming: `bot/auto-fork-{instance_id}`
+  - Empty if no instance suffix in config name
 
 ## Development
 

.claude/skills/auto-fork/SKILL.md

@@ -28,12 +28,15 @@ After this completes successfully, use the **push-and-pr** skill to push and cre
 
 ## Configuration
 
-Env vars (auto-provided by runtime):
+Required env vars:
 
 - `GH_USER_NAME` — bot GH username
 - `GL_USER_NAME` — bot GL username
-- `BOT_CONFIG_PATH` — config dir (default `rehor-config`)
-- `BOT_INSTANCE_ID` — instance ID (optional, for branch naming)
+
+Auto-discovered:
+
+- Config directory — scans `data/remote-config/*/agent/project-repos.json`
+- Instance ID — extracted from config directory name (e.g., `rehor-config-instance1` → `instance1`)
 
 ## Repo Detection
 

.claude/skills/auto-fork/auto_fork.py

@@ -84,23 +84,15 @@ def __init__(self, dry_run: bool = False):
         self.dry_run = dry_run
         self.bot_username = os.environ.get("GH_USER_NAME", "")
         self.gl_username = os.environ.get("GL_USER_NAME", "")
-        self.instance_id = os.environ.get("BOT_INSTANCE_ID", "")
-        self.config_path = os.environ.get("BOT_CONFIG_PATH", "rehor-config")
+
+        # Auto-discover config directory and instance ID
+        self.config_dir, self.config_name, self.instance_id = self._discover_config()
 
         # Validate inputs
         self._validate_inputs()
 
-        # Determine config directory
-        # Use remote-config if it exists (bot runtime), else fall back to local config
-        if REMOTE_CONFIG_DIR.exists() and (REMOTE_CONFIG_DIR / self.config_path).exists():
-            self.config_dir = REMOTE_CONFIG_DIR
-            logger.info(f"Using remote config at {self.config_dir}")
-        else:
-            self.config_dir = SCRIPT_DIR / self.config_path
-            logger.info(f"Using local config at {self.config_dir}")
-
         self.agent_dir = (
-            self.config_dir / self.config_path / "agent"
+            self.config_dir / self.config_name / "agent"
             if self.config_dir == REMOTE_CONFIG_DIR
             else self.config_dir / "agent"
         )
@@ -110,6 +102,53 @@ def __init__(self, dry_run: bool = False):
         self.repos_to_fork: List[RepoInfo] = []
         self.forked_repos: Dict[str, str] = {}  # name -> fork_url
 
+    def _discover_config(self) -> Tuple[Path, str, str]:
+        """
+        Auto-discover config directory and instance ID.
+
+        Searches for project-repos.json in:
+        1. data/remote-config/*/agent/project-repos.json (bot runtime)
+        2. <config-name>/agent/project-repos.json (local dev)
+
+        Returns:
+            Tuple of (config_dir, config_name, instance_id)
+
+        Raises:
+            ValueError: If no valid config directory found
+        """
+        # Try remote-config first (bot runtime)
+        if REMOTE_CONFIG_DIR.exists():
+            for subdir in REMOTE_CONFIG_DIR.iterdir():
+                if not subdir.is_dir():
+                    continue
+                candidate = subdir / "agent" / "project-repos.json"
+                if candidate.exists():
+                    config_name = subdir.name
+                    # Extract instance_id from config name if present
+                    # Pattern: rehor-config-instance1 -> instance1
+                    instance_id = ""
+                    if "-" in config_name:
+                        parts = config_name.split("-")
+                        if len(parts) > 2:  # e.g. rehor-config-instance1
+                            instance_id = "-".join(parts[2:])
+                    logger.info(f"Using remote config at {REMOTE_CONFIG_DIR / config_name}")
+                    return REMOTE_CONFIG_DIR, config_name, instance_id
+
+        # Fall back to local config (dev environment)
+        # Try common config directory names
+        for config_name in ["rehor-config", "config"]:
+            local_config = SCRIPT_DIR / config_name
+            candidate = local_config / "agent" / "project-repos.json"
+            if candidate.exists():
+                logger.info(f"Using local config at {local_config}")
+                return local_config, config_name, ""
+
+        raise ValueError(
+            "No config directory found. Expected project-repos.json in:\n"
+            f"  - {REMOTE_CONFIG_DIR}/*/agent/project-repos.json\n"
+            f"  - {SCRIPT_DIR}/<config-name>/agent/project-repos.json"
+        )
+
     def _validate_inputs(self) -> None:
         """
         Validate required environment variables and inputs.
@@ -124,9 +163,6 @@ def _validate_inputs(self) -> None:
         if not re.match(r"^[a-zA-Z0-9]([a-zA-Z0-9-]{0,37}[a-zA-Z0-9])?$", self.bot_username):
             raise ValueError(f"Invalid GitHub username: {self.bot_username}")
 
-        if not self.config_path:
-            raise ValueError("BOT_CONFIG_PATH cannot be empty")
-
     def detect_unforkable_repos(self) -> OperationResult:
         """
         Scan project-repos.json for repos needing forks.

.claude/skills/auto-fork/tests/conftest.py

@@ -7,7 +7,6 @@
 
 # Test constants
 TEST_BOT_USERNAME = "test-bot"
-TEST_INSTANCE_ID = "test-instance"
 GITLAB_HOST = "gitlab.cee.redhat.com"  # Match constant from auto_fork.py
 
 # Test data - repos configuration for fixtures
@@ -33,20 +32,22 @@ def set_env_vars(monkeypatch):
     """Set required env vars for all tests."""
     monkeypatch.setenv("GH_USER_NAME", TEST_BOT_USERNAME)
     monkeypatch.setenv("GL_USER_NAME", TEST_BOT_USERNAME)
-    monkeypatch.setenv("BOT_INSTANCE_ID", TEST_INSTANCE_ID)
-    monkeypatch.setenv("BOT_CONFIG_PATH", "test-config")
 
 
 @pytest.fixture
-def temp_config_dir(tmp_path):
+def temp_config_dir(tmp_path, monkeypatch):
     """
     Create temporary config directory structure with git repo.
 
     Creates:
-    - test-config/agent/project-repos.json with TEST_REPOS_CONFIG
+    - data/remote-config/test-config/agent/project-repos.json
     - Initialized git repo with origin remote
+    - Monkeypatches REMOTE_CONFIG_DIR to point to temp location
     """
-    config_dir = tmp_path / "test-config"
+    # Create data/remote-config structure (matches bot runtime)
+    data_dir = tmp_path / "data"
+    remote_config_dir = data_dir / "remote-config"
+    config_dir = remote_config_dir / "test-config"
     agent_dir = config_dir / "agent"
     agent_dir.mkdir(parents=True)
 
@@ -67,6 +68,11 @@ def temp_config_dir(tmp_path):
         check=True,
     )
 
+    # Monkeypatch REMOTE_CONFIG_DIR to point to temp location
+    import auto_fork
+
+    monkeypatch.setattr(auto_fork, "REMOTE_CONFIG_DIR", remote_config_dir)
+
     return config_dir