@ranger1/dx 0.1.32 → 0.1.33

package/@opencode/agents/pr-context.md

@@ -44,3 +44,27 @@ python3 ~/.opencode/agents/pr_context.py --pr <PR_NUMBER> --round <ROUND>
 - **失败/异常时**：
   - 若脚本 stdout 已输出合法 JSON（包含 `error` 或其他字段）→ 仍然**原样返回该 JSON**。
   - 若脚本未输出合法 JSON / 退出异常 → 仅输出一行 JSON：`{"error":"PR_CONTEXT_AGENT_FAILED"}`（必要时可加 `detail` 字段）。
+
+## GitHub 认证校验（重要）
+
+脚本会在调用 `gh repo view/gh pr view` 之前校验 GitHub CLI 已认证。
+
+- 为了避免 `gh auth status` 在“其他 host（例如 enterprise）认证异常”时误判，脚本会优先从 `git remote origin` 推断 host，并使用：
+  - `gh auth status --hostname <host>`
+- 推断失败时默认使用 `github.com`。
+
+可能出现的错误：
+
+- `{"error":"GH_CLI_NOT_FOUND"}`：找不到 `gh` 命令（PATH 内未安装/不可执行）
+  - 处理：安装 GitHub CLI：https://cli.github.com/
+- `{"error":"GH_NOT_AUTHENTICATED"}`：当前 repo 的 host 未认证
+  - 处理：`gh auth login --hostname <host>`
+
+本地排查命令（在同一个 shell 环境运行）：
+
+```bash
+git remote get-url origin
+gh auth status
+gh auth status --hostname github.com
+env | grep '^GH_'
+```

package/@opencode/agents/pr-precheck.md

@@ -38,6 +38,30 @@ python3 ~/.opencode/agents/pr_precheck.py <PR_NUMBER>
   - 若脚本 stdout 已输出合法 JSON（包含 `error` 或其他字段）→ 仍然**原样返回该 JSON**。
   - 若脚本未输出合法 JSON / 退出异常 → 仅输出一行 JSON：`{"error":"PR_PRECHECK_AGENT_FAILED"}`（必要时可加 `detail` 字段）。
 
+## GitHub 认证校验（重要）
+
+脚本会在执行 `gh pr view/checkout` 之前校验 GitHub CLI 已认证。
+
+- 为了避免 `gh auth status` 在“其他 host（例如 enterprise）认证异常”时误判，脚本会优先从 `git remote origin` 推断 host，并使用：
+  - `gh auth status --hostname <host>`
+- 推断失败时默认使用 `github.com`。
+
+可能出现的错误：
+
+- `{"error":"GH_CLI_NOT_FOUND"}`：找不到 `gh` 命令（PATH 内未安装/不可执行）
+  - 处理：安装 GitHub CLI：https://cli.github.com/
+- `{"error":"GH_NOT_AUTHENTICATED"}`：当前 repo 的 host 未认证
+  - 处理：`gh auth login --hostname <host>`
+
+本地排查命令（在同一个 shell 环境运行）：
+
+```bash
+git remote get-url origin
+gh auth status
+gh auth status --hostname github.com
+env | grep '^GH_'
+```
+
 ## 仅当出现 merge 冲突时怎么处理
 
 当脚本输出 `{"error":"PR_MERGE_CONFLICTS_UNRESOLVED"}` 时：

package/@opencode/agents/pr_context.py

@@ -9,8 +9,10 @@ import argparse
 import hashlib
 import json
 import os
+import re
 import subprocess
 import sys
+from urllib.parse import urlparse
 from pathlib import Path
 
 
@@ -24,8 +26,41 @@ def _json_out(obj):
 
 
 def _run_capture(cmd):
-    p = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    return p.returncode, p.stdout, p.stderr
+    try:
+        p = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
+        return p.returncode, p.stdout, p.stderr
+    except FileNotFoundError as e:
+        return 127, "", str(e)
+
+
+def _detect_git_remote_host():
+    # Best-effort parse from origin remote.
+    rc, origin_url, _ = _run_capture(["git", "remote", "get-url", "origin"])
+    if rc != 0:
+        rc, origin_url, _ = _run_capture(["git", "config", "--get", "remote.origin.url"])
+    if rc != 0:
+        return None
+
+    url = (origin_url or "").strip()
+    if not url:
+        return None
+
+    # Examples:
+    # - git@github.com:owner/repo.git
+    # - ssh://git@github.company.com/owner/repo.git
+    # - https://github.com/owner/repo.git
+    if url.startswith("git@"):  # SCP-like syntax
+        m = re.match(r"^git@([^:]+):", url)
+        return m.group(1) if m else None
+
+    if url.startswith("ssh://") or url.startswith("https://") or url.startswith("http://"):
+        try:
+            parsed = urlparse(url)
+            return parsed.hostname
+        except Exception:
+            return None
+
+    return None
 
 
 def _clip(s, n):
@@ -95,9 +130,31 @@ def main(argv):
         _json_out({"error": "NOT_A_GIT_REPO"})
         return 1
 
-    if subprocess.run(["gh", "auth", "status"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL).returncode != 0:
-        _json_out({"error": "GH_NOT_AUTHENTICATED"})
+    host = _detect_git_remote_host() or "github.com"
+    rc, gh_out, gh_err = _run_capture(["gh", "auth", "status", "--hostname", host])
+    if rc == 127:
+        _json_out({
+            "error": "GH_CLI_NOT_FOUND",
+            "detail": "gh not found in PATH",
+            "suggestion": "Install GitHub CLI: https://cli.github.com/",
+        })
         return 1
+    if rc != 0:
+        # If host detection is wrong, a global check might still succeed.
+        rc2, gh_out2, gh_err2 = _run_capture(["gh", "auth", "status"])
+        if rc2 == 0:
+            pass
+        else:
+            detail = (gh_err or gh_out or "").strip()
+            if len(detail) > 4000:
+                detail = detail[-4000:]
+            _json_out({
+                "error": "GH_NOT_AUTHENTICATED",
+                "host": host,
+                "detail": detail,
+                "suggestion": f"Run: gh auth login --hostname {host}",
+            })
+            return 1
 
     rc, owner_repo, _ = _run_capture(["gh", "repo", "view", "--json", "nameWithOwner", "--jq", ".nameWithOwner"])
     owner_repo = owner_repo.strip() if rc == 0 else ""

package/@opencode/agents/pr_precheck.py

@@ -18,10 +18,19 @@ import re
 import secrets
 import subprocess
 import sys
+from urllib.parse import urlparse
 from pathlib import Path
 
 
 def run(cmd, *, cwd=None, stdout_path=None, stderr_path=None):
+    try:
+        return _run(cmd, cwd=cwd, stdout_path=stdout_path, stderr_path=stderr_path)
+    except FileNotFoundError as e:
+        # Match common shell semantics for "command not found".
+        return 127
+
+
+def _run(cmd, *, cwd=None, stdout_path=None, stderr_path=None):
     if stdout_path and stderr_path and stdout_path == stderr_path:
         with open(stdout_path, "wb") as f:
             p = subprocess.run(cmd, cwd=cwd, stdout=f, stderr=f)
@@ -45,8 +54,42 @@ def run(cmd, *, cwd=None, stdout_path=None, stderr_path=None):
 
 
 def run_capture(cmd, *, cwd=None):
-    p = subprocess.run(cmd, cwd=cwd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    return p.returncode, p.stdout, p.stderr
+    try:
+        p = subprocess.run(cmd, cwd=cwd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
+        return p.returncode, p.stdout, p.stderr
+    except FileNotFoundError as e:
+        return 127, "", str(e)
+
+
+def _detect_git_remote_host():
+    # Best-effort parse from origin remote.
+    rc, origin_url, _ = run_capture(["git", "remote", "get-url", "origin"])
+    if rc != 0:
+        rc, origin_url, _ = run_capture(["git", "config", "--get", "remote.origin.url"])
+    if rc != 0:
+        return None
+
+    url = (origin_url or "").strip()
+    if not url:
+        return None
+
+    # Examples:
+    # - git@github.com:owner/repo.git
+    # - ssh://git@github.company.com/owner/repo.git
+    # - https://github.com/owner/repo.git
+    if url.startswith("git@"):  # SCP-like syntax
+        # git@host:owner/repo(.git)
+        m = re.match(r"^git@([^:]+):", url)
+        return m.group(1) if m else None
+
+    if url.startswith("ssh://") or url.startswith("https://") or url.startswith("http://"):
+        try:
+            parsed = urlparse(url)
+            return parsed.hostname
+        except Exception:
+            return None
+
+    return None
 
 
 def tail_text(path, max_lines=200, max_chars=12000):
@@ -101,9 +144,25 @@ def main():
         print(json.dumps({"error": "NOT_A_GIT_REPO"}))
         return 1
 
-    rc = run(["gh", "auth", "status"])
+    host = _detect_git_remote_host() or "github.com"
+    rc, gh_out, gh_err = run_capture(["gh", "auth", "status", "--hostname", host])
+    if rc == 127:
+        print(json.dumps({
+            "error": "GH_CLI_NOT_FOUND",
+            "detail": "gh not found in PATH",
+            "suggestion": "Install GitHub CLI: https://cli.github.com/",
+        }))
+        return 1
     if rc != 0:
-        print(json.dumps({"error": "GH_NOT_AUTHENTICATED"}))
+        detail = (gh_err or gh_out or "").strip()
+        if len(detail) > 4000:
+            detail = detail[-4000:]
+        print(json.dumps({
+            "error": "GH_NOT_AUTHENTICATED",
+            "host": host,
+            "detail": detail,
+            "suggestion": f"Run: gh auth login --hostname {host}",
+        }))
         return 1
 
     rc, pr_json, _ = run_capture(["gh", "pr", "view", pr, "--json", "headRefName,baseRefName,mergeable"])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ranger1/dx",
-  "version": "0.1.32",
+  "version": "0.1.33",
   "type": "module",
   "license": "MIT",
   "repository": {