@ranger1/dx 0.1.41 → 0.1.43

package/@opencode/agents/pr-review-aggregate.md

@@ -1,7 +1,7 @@
 ---
 description: aggregate PR reviews + create fix file
 mode: subagent
-model: openai/gpt-5.1-codex-mini
+model: github-copilot/claude-sonnet-4.5
 temperature: 0.1
 tools:
   bash: true
@@ -133,7 +133,7 @@ python3 ~/.opencode/agents/pr_review_aggregate.py \
   - 禁止：前后空行
 - **失败/异常时**：
   - 若脚本 stdout 已输出合法 JSON（包含 `error` 或其他字段）→ 仍然**原样返回该 JSON**。
-  - 若脚本未输出合法 JSON / 退出异常 → 仅输出一行 JSON：`{"error":"PR_REVIEW_AGGREGATE_AGENT_FAILED"}`（必要时可加 `detail` 字段）。
+  - 若脚本未输出合法 JSON / 退出异常 → 仅返回一行 JSON：`{"error":"PR_REVIEW_AGGREGATE_AGENT_FAILED"}`（必要时可加 `detail` 字段）。
 
 ## fixFile 结构（补充说明）
 

package/@opencode/agents/pr_context.py

@@ -116,9 +116,37 @@ def _git_fetch_origin(ref):
     subprocess.run(["git", "fetch", "origin", ref], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
 
-def _git_numstat(base_ref):
-    # Prefer origin/<base>...HEAD; fallback to <base>...HEAD.
-    for lhs in (f"origin/{base_ref}...HEAD", f"{base_ref}...HEAD"):
+def _gh_default_branch(owner_repo):
+    if not owner_repo:
+        return ""
+    rc, out, _ = _run_capture(
+        [
+            "gh",
+            "repo",
+            "view",
+            "--repo",
+            owner_repo,
+            "--json",
+            "defaultBranchRef",
+            "--jq",
+            ".defaultBranchRef.name",
+        ]
+    )
+    if rc != 0:
+        return ""
+    return (out or "").strip()
+
+
+def _git_numstat(base_ref, base_oid):
+    # Prefer commit-oid diff when available; it's unambiguous for stacked PRs.
+    candidates = []
+    if base_oid:
+        candidates.append(f"{base_oid}...HEAD")
+    if base_ref:
+        candidates.append(f"origin/{base_ref}...HEAD")
+        candidates.append(f"{base_ref}...HEAD")
+
+    for lhs in candidates:
         rc, out, _ = _run_capture(["git", "diff", "--numstat", lhs])
         if rc == 0:
             return out
@@ -205,15 +233,22 @@ def main(argv):
         return 1
 
     head_oid = (pr.get("headRefOid") or "").strip()
-    base_ref = (pr.get("baseRefName") or "").strip() or "main"
+    base_oid = (pr.get("baseRefOid") or "").strip()
+    base_ref = (pr.get("baseRefName") or "").strip()
+    if not base_ref:
+        base_ref = _gh_default_branch(owner_repo)
+    if not base_ref and not base_oid:
+        _json_out({"error": "PR_BASE_REF_NOT_FOUND"})
+        return 1
     head_ref = (pr.get("headRefName") or "").strip()
     url = (pr.get("url") or "").strip()
 
     seed = f"{pr_number}:{round_num}:{head_oid}".encode("utf-8")
     run_id = hashlib.sha1(seed).hexdigest()[:12]
 
-    _git_fetch_origin(base_ref)
-    file_rows = _parse_numstat(_git_numstat(base_ref))
+    if base_ref:
+        _git_fetch_origin(base_ref)
+    file_rows = _parse_numstat(_git_numstat(base_ref, base_oid))
 
     labels = []
     for l in (pr.get("labels") or []):

package/@opencode/agents/pr_precheck.py

@@ -4,7 +4,7 @@
 # - Verify GitHub auth (gh)
 # - Read PR info (headRefName/baseRefName/mergeable)
 # - Checkout PR branch (gh pr checkout) if needed
-# - Fetch base branch (origin/<base>, fallback main/master)
+# - Fetch base branch (origin/<base>)
 # - If mergeable == CONFLICTING: return {"error":"PR_MERGE_CONFLICTS_UNRESOLVED"}
 # - Run dx cache clear
 # - Run dx lint and dx build all concurrently
@@ -227,17 +227,8 @@ def main():
         return 1
 
     if run(["git", "fetch", "origin", base]) != 0:
-        ok = False
-        for fallback in ("main", "master"):
-            if fallback == base:
-                continue
-            if run(["git", "fetch", "origin", fallback]) == 0:
-                base = fallback
-                ok = True
-                break
-        if not ok:
-            print(json.dumps({"error": "PR_BASE_REF_FETCH_FAILED"}))
-            return 1
+        print(json.dumps({"error": "PR_BASE_REF_FETCH_FAILED", "baseRefName": base}))
+        return 1
 
     if mergeable == "CONFLICTING":
         print(json.dumps({"error": "PR_MERGE_CONFLICTS_UNRESOLVED"}))

package/@opencode/commands/doctor.md

@@ -18,13 +18,14 @@ pnpm add -g @ranger1/dx@latest  && dx initial
 
 ## Step 1: 并行检测
 
-**同时执行以下 4 个 Bash 调用（真正并行）：**
+**同时执行以下 5 个 Bash 调用（真正并行）：**
 
 ```bash
 # 批次 1: CLI 版本检测
 echo "=== CLI_VERSIONS ===";
 echo "opencode:" && (which opencode && opencode --version 2>/dev/null || echo "NOT_FOUND");
 echo "dx:" && (which dx && dx --version 2>/dev/null || echo "NOT_FOUND");
+echo "rg:" && (which rg && rg --version 2>/dev/null | head -n 1 || echo "NOT_FOUND");
 echo "agent-browser:" && (which agent-browser && agent-browser --version 2>/dev/null || echo "NOT_FOUND");
 ```
 
@@ -65,6 +66,7 @@ echo "python:" && (which python && python --version 2>/dev/null || echo "NOT_FOU
 工具                                  | 状态     | 版本
 opencode                              | <状态>   | <版本>
 dx                                    | <状态>   | <版本>
+rg                                    | <状态>   | <版本>
 python3                               | <状态>   | <版本>
 python(软链接)                         | <状态>   | <版本>
 AGENTS.md                             | <状态>   | -
@@ -82,7 +84,7 @@ attach（全局配置写入）                 | <状态>   | -
 
 `AskUserQuestion`: 检测到以下缺失项，是否自动安装/配置所有？
 
-确认后按顺序处理：
+确认后按顺序处理（需要直接执行对应安装/配置命令，不要只输出提示）：
 
 ### 3.1 opencode CLI 未安装
 
@@ -100,6 +102,32 @@ brew install opencode || npm install -g opencode
 - AGENTS.md 文件不存在，OpenCode 需要此文件作为项目指令入口
 - 建议创建或检查文件路径
 
+### 3.3 rg（ripgrep）未安装
+
+执行安装（幂等：已安装会跳过；缺少包管理器会报错并提示手动安装）：
+
+```bash
+set -e
+
+if command -v rg >/dev/null 2>&1; then
+  rg --version 2>/dev/null | head -n 1 || true
+  exit 0
+fi
+
+if command -v brew >/dev/null 2>&1; then
+  brew install ripgrep
+elif command -v apt-get >/dev/null 2>&1; then
+  sudo apt-get update
+  sudo apt-get install -y ripgrep
+else
+  echo "ripgrep (rg) NOT_FOUND, and no supported package manager (brew/apt-get) detected"
+  echo "Please install ripgrep manually: https://github.com/BurntSushi/ripgrep#installation"
+  exit 1
+fi
+
+rg --version 2>/dev/null | head -n 1 || true
+```
+
 ### 3.6 agent-browser 未安装
 
 执行安装：

package/@opencode/commands/git-commit-and-pr.md

@@ -223,8 +223,10 @@ git push -u origin HEAD
 #### 4.2 分析变更
 
 ```bash
-git log origin/master..HEAD --oneline
-git diff origin/master...HEAD --stat
+# 优先使用 origin/HEAD（远端默认分支），避免硬编码 main/master。
+# 如需指定基准分支，使用：/git-commit-and-pr --pr --base <BRANCH>
+git log origin/HEAD..HEAD --oneline
+git diff origin/HEAD...HEAD --stat
 ```
 
 #### 4.3 创建 PR

package/@opencode/commands/oh_attach.json

@@ -7,18 +7,18 @@
   },
  "agents": {
     "sisyphus": {
-      "model": "openai/gpt-5.2",
+      "model": "openai/gpt-5.3-codex",
       "variant": "none"
     },
     "oracle": {
-      "model": "openai/gpt-5.2",
+      "model": "openai/gpt-5.3-codex",
       "variant": "high"
     },
     "librarian": {
-      "model": "github-copilot/gpt-5-mini"
+      "model": "openai/gpt-5.1-codex-mini"
     },
     "explore": {
-      "model": "github-copilot/gpt-5-mini"
+      "model": "openai/gpt-5.1-codex-mini"
     },
     "multimodal-looker": {
       "model": "github-copilot/gemini-3-flash-preview"
@@ -36,10 +36,10 @@
       "variant": "medium"
     },
     "atlas": {
-      "model": "openai/gpt-5.2-codex"
+      "model": "openai/gpt-5.3-codex"
     },
     "codex-reviewer": {
-      "model": "openai/gpt-5.2-codex",
+      "model": "openai/gpt-5.3-codex",
       "variant": "xhigh",
       "temperature": 0.1
     },
@@ -64,7 +64,7 @@
       "variant": "high"
     },
     "ultrabrain": {
-      "model": "openai/gpt-5.2-codex",
+      "model": "openai/gpt-5.3-codex",
       "variant": "xhigh"
     },
     "artistry": {
@@ -72,7 +72,7 @@
       "variant": "max"
     },
     "quick": {
-      "model": "github-copilot/claude-haiku-4.5"
+      "model": "openai/gpt-5.1-codex-mini"
     },
     "middle": {
       "model": "github-copilot/claude-sonnet-4.5"
@@ -82,7 +82,7 @@
       "variant": "medium"
     },
     "unspecified-high": {
-      "model": "openai/gpt-5.2",
+      "model": "openai/gpt-5.3-codex",
       "variant": "medium"
     },
     "writing": {

package/@opencode/commands/opencode_attach.json

@@ -10,7 +10,7 @@
   ],
   "agent": {
     "quick": {
-      "model": "github-copilot/gpt-5-mini"
+      "model": "openai/gpt-5.1-codex-mini"
     },
     "middle": {
       "model": "github-copilot/claude-sonnet-4.5"
@@ -22,5 +22,5 @@
       "*.env.*": "allow"
     }
   },  
-  "model": "openai/gpt-5.2"
+  "model": "openai/gpt-5.3-codex"
 }

package/@opencode/commands/pr-review-loop.md

@@ -6,6 +6,12 @@ agent: sisyphus
 
 # PR Review Loop
 
+## Stacked PR / PR -> PR（重要）
+
+- 本流程的 diff 基准来自 GitHub PR 元数据的 `baseRefName`（不是硬编码 main/master），因此天然支持“PR 合并到另一个 PR 分支”的 stacked PR。
+- 当 `baseRefName` 缺失时：会回退到仓库默认分支（`defaultBranchRef.name`）。
+- 当 base 分支 fetch 失败时：会直接报错终止（不再静默回退到 main/master），避免 review/changed-files 基准悄悄跑偏。
+
 ## 输入
 
 - `{{PR_NUMBER}}`

package/lib/worktree.js

@@ -685,7 +685,7 @@ class WorktreeManager {
 
         // 检查未推送的提交
         const unpushed = execSync(
-          `git log origin/${branchName}..${branchName} --oneline 2>/dev/null || git log origin/main..${branchName} --oneline`,
+          `git log origin/${branchName}..${branchName} --oneline 2>/dev/null || git log origin/HEAD..${branchName} --oneline`,
         ).toString()
         if (unpushed.trim()) {
           hasUnpushedCommits = true

package/package.json

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