🩹 fix: detect parent repo for fork preflight

Author: ShigureNyako

src/gh_llm/commands/repo.py

@@ -184,6 +184,7 @@ def render_repo_branch_protection(preflight: RepoPreflight) -> list[str]:
 
 def render_repo_next_commands(preflight: RepoPreflight) -> list[str]:
     repo = f"{preflight.owner}/{preflight.name}"
+    pr_target_repo = preflight.parent_repo if preflight.is_fork and preflight.parent_repo is not None else repo
     lines = [
         "## Next Commands",
         "These commands are inferred from the permission, onboarding-file, and default-branch protection signals above.",
@@ -213,14 +214,17 @@ def render_repo_next_commands(preflight: RepoPreflight) -> list[str]:
         )
         step += 1
 
-    lines.append(f"{step}. Open your PR against the default branch:")
-    lines.append(f"   ⏎ `gh pr create --repo {repo} --base {preflight.default_branch}`")
+    if pr_target_repo != repo:
+        lines.append(f"{step}. Open your PR against the parent repository:")
+    else:
+        lines.append(f"{step}. Open your PR against the default branch:")
+    lines.append(f"   ⏎ `gh pr create --repo {pr_target_repo} --base {preflight.default_branch}`")
     step += 1
 
     protection = preflight.branch_protection
     if protection is not None and protection.requires_status_checks:
         lines.append(f"{step}. Check required CI after the PR exists:")
-        lines.append(f"   ⏎ `{display_command_with(f'pr checks --pr <pr_number> --repo {repo}')}`")
+        lines.append(f"   ⏎ `{display_command_with(f'pr checks --pr <pr_number> --repo {pr_target_repo}')}`")
 
     lines.append("")
     return lines

src/gh_llm/github_api.py

@@ -887,6 +887,8 @@ def resolve_repo_preflight(self, repo: str) -> RepoPreflight:
         parent_obj = _as_dict_optional(payload.get("parent"))
         viewer_permission = _normalized_optional_str(payload.get("viewerPermission"))
         can_push = viewer_permission in {"ADMIN", "MAINTAIN", "WRITE"}
+        is_fork = bool(payload.get("isFork"))
+        parent_repo = _extract_parent_repo_full_name(parent_obj)
         branch_protection = self._resolve_default_branch_protection(
             owner=owner,
             name=name,
@@ -904,8 +906,8 @@ def resolve_repo_preflight(self, repo: str) -> RepoPreflight:
             viewer_permission=viewer_permission,
             can_push=can_push,
             fork_recommended=(not can_push),
-            is_fork=bool(payload.get("isFork")),
-            parent_repo=_normalized_optional_str(parent_obj.get("nameWithOwner")) if parent_obj is not None else None,
+            is_fork=is_fork,
+            parent_repo=parent_repo,
             tree_truncated=tree_truncated,
             contributing_docs=_collect_repo_documents(tree_items, kind="contributing"),
             agents_docs=_collect_repo_documents(tree_items, kind="agents"),
@@ -3198,6 +3200,26 @@ def _normalized_optional_str(value: object) -> str | None:
     return normalized or None
 
 
+def _extract_parent_repo_full_name(parent_obj: dict[str, object] | None) -> str | None:
+    if parent_obj is None:
+        return None
+
+    direct = _normalized_optional_str(parent_obj.get("nameWithOwner"))
+    if direct is not None:
+        return direct
+
+    full_name = _normalized_optional_str(parent_obj.get("full_name"))
+    if full_name is not None:
+        return full_name
+
+    owner_obj = _as_dict_optional(parent_obj.get("owner"))
+    owner_login = _normalized_optional_str(owner_obj.get("login")) if owner_obj is not None else None
+    name = _normalized_optional_str(parent_obj.get("name"))
+    if owner_login is not None and name is not None:
+        return f"{owner_login}/{name}"
+    return None
+
+
 def _collect_repo_documents(tree_items: list[object], *, kind: str) -> tuple[RepoDocument, ...]:
     docs: list[RepoDocument] = []
     seen: set[str] = set()

tests/test_cli.py

@@ -115,21 +115,8 @@ def run(self, cmd: list[str], *, check: bool, capture_output: bool, text: bool)
             )
 
         if cmd[:3] == ["gh", "repo", "view"]:
-            return FakeCompletedProcess(
-                json.dumps(
-                    {
-                        "nameWithOwner": "PaddlePaddle/Paddle",
-                        "description": "PaddlePaddle core framework",
-                        "homepageUrl": "https://www.paddlepaddle.org.cn/",
-                        "isFork": False,
-                        "parent": None,
-                        "url": "https://github.com/PaddlePaddle/Paddle",
-                        "sshUrl": "git@github.com:PaddlePaddle/Paddle.git",
-                        "viewerPermission": "READ",
-                        "defaultBranchRef": {"name": "develop"},
-                    }
-                )
-            )
+            repo = cmd[3] if len(cmd) > 3 else "PaddlePaddle/Paddle"
+            return FakeCompletedProcess(json.dumps(_repo_view_payload(repo)))
 
         if cmd[:3] == ["gh", "api", "user"]:
             return FakeCompletedProcess(json.dumps({"login": "ShigureNyako"}))
@@ -138,7 +125,7 @@ def run(self, cmd: list[str], *, check: bool, capture_output: bool, text: bool)
             return FakeCompletedProcess(json.dumps(_pull_files_payload(cmd[2])))
 
         if cmd[:2] == ["gh", "api"] and len(cmd) >= 3 and "/git/trees/" in cmd[2]:
-            return FakeCompletedProcess(json.dumps(_repo_tree_payload()))
+            return FakeCompletedProcess(json.dumps(_repo_tree_payload(cmd[2])))
 
         if cmd[:2] == ["gh", "api"] and len(cmd) >= 3 and "/branches/" in cmd[2]:
             payload = _repo_branch_payload(cmd[2])
@@ -2345,6 +2332,27 @@ def run_with_truncated_tree(
     assert "gh browse -R PaddlePaddle/Paddle --branch develop 'CONTRIBUTING_GUIDE.md'" in out
 
 
+def test_repo_preflight_surfaces_parent_repo_and_targets_upstream_pr_for_forks(
+    monkeypatch: pytest.MonkeyPatch,
+    tmp_path: Path,
+    capsys: pytest.CaptureFixture[str],
+) -> None:
+    responder = GhResponder()
+    monkeypatch.setattr(github_api.subprocess, "run", responder.run)
+    monkeypatch.setenv("XDG_CACHE_HOME", str(tmp_path))
+
+    code = cli.run(["repo", "preflight", "--repo", "ShigureNyako/gh-llm"])
+    assert code == 0
+
+    out = capsys.readouterr().out
+    assert "repo: ShigureNyako/gh-llm" in out
+    assert "is_fork: true" in out
+    assert "parent_repo: ShigureLab/gh-llm" in out
+    assert "Parent repo: `ShigureLab/gh-llm`" in out
+    assert "gh pr create --repo ShigureLab/gh-llm --base main" in out
+    assert "gh pr create --repo ShigureNyako/gh-llm --base main" not in out
+
+
 def _branch_protection_rules_payload(after: str | None) -> dict[str, Any]:
     del after
     return {
@@ -2378,7 +2386,45 @@ def _branch_protection_rules_payload(after: str | None) -> dict[str, Any]:
     }
 
 
-def _repo_tree_payload() -> dict[str, Any]:
+def _repo_view_payload(repo: str) -> dict[str, Any]:
+    if repo == "ShigureNyako/gh-llm":
+        return {
+            "nameWithOwner": "ShigureNyako/gh-llm",
+            "description": "Forked gh-llm workspace",
+            "homepageUrl": "",
+            "isFork": True,
+            "parent": {
+                "name": "gh-llm",
+                "owner": {"login": "ShigureLab"},
+            },
+            "url": "https://github.com/ShigureNyako/gh-llm",
+            "sshUrl": "git@github.com:ShigureNyako/gh-llm.git",
+            "viewerPermission": "ADMIN",
+            "defaultBranchRef": {"name": "main"},
+        }
+    return {
+        "nameWithOwner": "PaddlePaddle/Paddle",
+        "description": "PaddlePaddle core framework",
+        "homepageUrl": "https://www.paddlepaddle.org.cn/",
+        "isFork": False,
+        "parent": None,
+        "url": "https://github.com/PaddlePaddle/Paddle",
+        "sshUrl": "git@github.com:PaddlePaddle/Paddle.git",
+        "viewerPermission": "READ",
+        "defaultBranchRef": {"name": "develop"},
+    }
+
+
+def _repo_tree_payload(path: str) -> dict[str, Any]:
+    if "repos/ShigureNyako/gh-llm/" in path:
+        return {
+            "sha": "mock-tree-sha",
+            "truncated": False,
+            "tree": [
+                {"path": "README.md", "type": "blob"},
+                {"path": "skills/github-conversation/SKILL.md", "type": "blob"},
+            ],
+        }
     return {
         "sha": "mock-tree-sha",
         "truncated": False,
@@ -2396,6 +2442,19 @@ def _repo_tree_payload() -> dict[str, Any]:
 def _repo_branch_payload(path: str) -> dict[str, Any] | None:
     if "/branches/" not in path:
         return None
+    if "repos/ShigureNyako/gh-llm/branches/main" in path:
+        return {
+            "name": "main",
+            "protected": False,
+            "protection": {
+                "enabled": False,
+                "required_status_checks": {
+                    "enforcement_level": "off",
+                    "contexts": [],
+                    "checks": [],
+                },
+            },
+        }
     return {
         "name": "develop",
         "protected": True,