@ranger1/dx 0.1.40 → 0.1.41

package/@opencode/commands/doctor.md

@@ -18,7 +18,7 @@ pnpm add -g @ranger1/dx@latest  && dx initial
 
 ## Step 1: 并行检测
 
-**同时执行以下 3 个 Bash 调用（真正并行）：**
+**同时执行以下 4 个 Bash 调用（真正并行）：**
 
 ```bash
 # 批次 1: CLI 版本检测
@@ -32,24 +32,20 @@ echo "agent-browser:" && (which agent-browser && agent-browser --version 2>/dev/
 # 批次 2: 项目文件检测
 echo "=== PROJECT_FILES ===";
 echo "AGENTS.md:" && (test -f AGENTS.md && echo "FOUND" || echo "NOT_FOUND");
-echo "instructions:" && (grep -q '"AGENTS.md"' ~/.config/opencode/opencode.json 2>/dev/null && grep -q '"ruler/' ~/.config/opencode/opencode.json 2>/dev/null && echo "CONFIGURED" || echo "NOT_CONFIGURED");
 ```
 
 ```bash
 # 批次 3: OpenCode 插件检测
 # 注意:插件名可能带版本号(如 @1.3.0),使用模糊匹配
 echo "=== OPENCODE_PLUGINS ===";
-echo "oh-my-opencode:" && (grep -q 'oh-my-opencode' ~/.config/opencode/opencode.json 2>/dev/null && echo "INSTALLED" || echo "NOT_INSTALLED");
-echo "opencode-openai-codex-auth:" && (grep -q 'opencode-openai-codex-auth' ~/.config/opencode/opencode.json 2>/dev/null && echo "INSTALLED" || echo "NOT_INSTALLED");
+echo "oh-my-opencode:" && (opencode plugin list 2>/dev/null | grep -q 'oh-my-opencode' && echo "INSTALLED" || echo "NOT_INSTALLED");
+echo "opencode-openai-codex-auth:" && (opencode plugin list 2>/dev/null | grep -q 'opencode-openai-codex-auth' && echo "INSTALLED" || echo "NOT_INSTALLED");
 ```
 
 ```bash
-# 批次 4: oh-my-opencode.json 配置检测
-echo "=== OMO_CONFIG ===";
-echo "sisyphus_agent:" && (grep -q '"sisyphus_agent"' ~/.config/opencode/oh-my-opencode.json 2>/dev/null && echo "CONFIGURED" || echo "NOT_CONFIGURED");
-echo "agents.sisyphus.variant:" && (node -e "const fs=require('node:fs');const os=require('node:os');const p=os.homedir()+'/.config/opencode/oh-my-opencode.json';try{const j=JSON.parse(fs.readFileSync(p,'utf8'));process.exit(j?.agents?.sisyphus?.variant==='none'?0:1)}catch(e){process.exit(1)}" 2>/dev/null && echo "CONFIGURED" || echo "NOT_CONFIGURED");
-echo "agent.quick:" && (grep -Eq '"agent"[[:space:]]*:' ~/.config/opencode/opencode.json 2>/dev/null && grep -Eq '"quick"[[:space:]]*:' ~/.config/opencode/opencode.json 2>/dev/null && echo "CONFIGURED" || echo "NOT_CONFIGURED");
-echo "agent.middle:" && (grep -Eq '"agent"[[:space:]]*:' ~/.config/opencode/opencode.json 2>/dev/null && grep -Eq '"middle"[[:space:]]*:' ~/.config/opencode/opencode.json 2>/dev/null && echo "CONFIGURED" || echo "NOT_CONFIGURED");
+# 批次 4: attach 配置（统一）
+echo "=== OPENCODE_ATTACH ===";
+echo "attach:" && (python3 ~/.opencode/commands/opencode_attach.py --dry-run >/dev/null 2>&1 && echo "READY" || echo "NOT_READY");
 ```
 
 ```bash
@@ -72,14 +68,10 @@ dx                                    | <状态>   | <版本>
 python3                               | <状态>   | <版本>
 python(软链接)                         | <状态>   | <版本>
 AGENTS.md                             | <状态>   | -
-全局 instructions 配置                 | <状态>   | -
 oh-my-opencode 插件                   | <状态>   | -
 opencode-openai-codex-auth 插件       | <状态>   | -
 agent-browser                         | <状态>   | <版本>
-全局 sisyphus_agent 配置              | <状态>   | -
-全局 agents.sisyphus.variant 配置     | <状态>   | -
-全局 agent.quick 配置                 | <状态>   | -
-全局 agent.middle 配置                | <状态>   | -
+attach（全局配置写入）                 | <状态>   | -
 ```
 
 ---
@@ -107,62 +99,6 @@ brew install opencode || npm install -g opencode
 
 - AGENTS.md 文件不存在，OpenCode 需要此文件作为项目指令入口
 - 建议创建或检查文件路径
-- AGENTS.md 应位于项目根目录，并在全局 `~/.config/opencode/opencode.json` 的 `instructions` 中引用
-
-### 3.3 全局 opencode.json instructions 配置缺失
-
-**注意：instructions 配置应在全局配置文件 `~/.config/opencode/opencode.json` 中，而非项目根目录。项目根目录不需要 opencode.json 文件。**
-
-1. 先读取现有全局配置：
-
-```bash
-cat ~/.config/opencode/opencode.json
-```
-
-2. 使用 Edit 工具在 `~/.config/opencode/opencode.json` 中添加或修改 `instructions` 配置：
-
-```json
-{
-  "$schema": "https://opencode.ai/config.json",
-  "instructions": ["AGENTS.md", "ruler/**/*.md"]
-}
-```
-
-### 3.4 全局配置指令无效
-
-使用 Edit 工具修复 `~/.config/opencode/opencode.json`，确保包含：
-
-- `"AGENTS.md"`: 主配置文件
-- `"ruler/**/*.md"`: 自动加载 ruler 目录下所有 .md 文件（因 OpenCode 不支持 @ 引用）
-
-### 3.5 全局 OpenCode 插件安装
-
-**注意：OpenCode 插件配置应在全局配置文件 `~/.config/opencode/opencode.json` 中，而非项目根目录。**
-
-1. 先读取现有全局配置：
-
-```bash
-cat ~/.config/opencode/opencode.json
-```
-
-2. 使用 Edit 工具在 `~/.config/opencode/opencode.json` 的 `plugin` 数组中添加缺失的插件：
-   - `oh-my-opencode`
-   - `opencode-openai-codex-auth`
-
-示例 plugin 配置：
-
-```json
-"plugin": [
-  "oh-my-opencode",
-  "opencode-openai-codex-auth"
-]
-```
-
-3. 验证安装：
-
-```bash
-grep -E 'oh-my-opencode|opencode-openai-codex-auth' ~/.config/opencode/opencode.json
-```
 
 ### 3.6 agent-browser 未安装
 
@@ -212,87 +148,15 @@ fi
 python --version
 ```
 
-### 3.7 全局 oh-my-opencode.json 配置缺失
-
-**注意：oh-my-opencode 配置应在全局配置文件 `~/.config/opencode/oh-my-opencode.json` 中，而非项目根目录。**
+### 3.9 自动 attach（推荐）
 
-1. 先读取现有全局配置：
+执行 attach（会自动覆盖/新建对应节点，其它不动，并生成备份文件）：
 
 ```bash
-cat ~/.config/opencode/oh-my-opencode.json
-```
-
-2. 使用 Edit 工具添加缺失的配置节点：
-
-#### 3.7.1 sisyphus_agent 配置缺失
-
-如果根节点缺少 `sisyphus_agent`，使用 Edit 工具添加：
-
-```json
-{
-  "sisyphus_agent": {
-    "disabled": false,
-    "default_builder_enabled": true,
-    "planner_enabled": true,
-    "replace_plan": false
-  }
-}
+python3 ~/.opencode/commands/opencode_attach.py
 ```
 
-注意：这是根节点配置，应添加到 JSON 的第一层级。
 
-#### 3.7.2 agents.sisyphus.variant 不是 none
-
-如果 `~/.config/opencode/oh-my-opencode.json` 的 `agents.sisyphus.variant` 缺失或不是 `none`，使用 Edit 工具修复为：
-
-```json
-{
-  "agents": {
-    "sisyphus": {
-      "variant": "none"
-    }
-  }
-}
-```
-
-3. 验证配置：
-
-```bash
-# 检查 sisyphus_agent
-grep -q '"sisyphus_agent"' ~/.config/opencode/oh-my-opencode.json && echo "✅ sisyphus_agent 已配置" || echo "❌ sisyphus_agent 缺失"
-
-# 检查 agents.sisyphus.variant
-node -e "const fs=require('node:fs');const os=require('node:os');const p=os.homedir()+'/.config/opencode/oh-my-opencode.json';const j=JSON.parse(fs.readFileSync(p,'utf8'));console.log(j?.agents?.sisyphus?.variant||'MISSING');process.exit(j?.agents?.sisyphus?.variant==='none'?0:1)" && echo "✅ agents.sisyphus.variant=none" || echo "❌ agents.sisyphus.variant 不是 none"
-```
-
-### 3.8 全局 opencode.json agent 配置缺失
-
-**注意：agent 配置应在全局配置文件 `~/.config/opencode/opencode.json` 中，而非项目根目录。**
-
-如果 `~/.config/opencode/opencode.json` 缺少 `agent.quick` 或 `agent.middle`，使用 Edit 工具添加：
-
-```json
-{
-  "agent": {
-    "quick": {
-      "model": "github-copilot/claude-haiku-4.5"
-    },
-    "middle": {
-      "model": "github-copilot/claude-sonnet-4.5"
-    }
-  }
-}
-```
-
-验证配置：
-
-```bash
-# 检查 agent.quick
-grep -Eq '"agent"[[:space:]]*:' ~/.config/opencode/opencode.json && grep -Eq '"quick"[[:space:]]*:' ~/.config/opencode/opencode.json && echo "✅ agent.quick 已配置" || echo "❌ agent.quick 缺失"
-
-# 检查 agent.middle
-grep -Eq '"agent"[[:space:]]*:' ~/.config/opencode/opencode.json && grep -Eq '"middle"[[:space:]]*:' ~/.config/opencode/opencode.json && echo "✅ agent.middle 已配置" || echo "❌ agent.middle 缺失"
-```
 
 ---
 

package/@opencode/commands/oh_attach.json

@@ -0,0 +1,92 @@
+{  
+  "sisyphus_agent": {
+    "disabled": false,
+    "default_builder_enabled": true,
+    "planner_enabled": true,
+    "replace_plan": false
+  },
+ "agents": {
+    "sisyphus": {
+      "model": "openai/gpt-5.2",
+      "variant": "none"
+    },
+    "oracle": {
+      "model": "openai/gpt-5.2",
+      "variant": "high"
+    },
+    "librarian": {
+      "model": "github-copilot/gpt-5-mini"
+    },
+    "explore": {
+      "model": "github-copilot/gpt-5-mini"
+    },
+    "multimodal-looker": {
+      "model": "github-copilot/gemini-3-flash-preview"
+    },
+    "prometheus": {
+      "model": "openai/gpt-5.2",
+      "variant": "max"
+    },
+    "metis": {
+      "model": "openai/gpt-5.2",
+      "variant": "max"
+    },
+    "momus": {
+      "model": "openai/gpt-5.2",
+      "variant": "medium"
+    },
+    "atlas": {
+      "model": "openai/gpt-5.2-codex"
+    },
+    "codex-reviewer": {
+      "model": "openai/gpt-5.2-codex",
+      "variant": "xhigh",
+      "temperature": 0.1
+    },
+    "gemini-reviewer": {
+      "model": "github-copilot/gemini-3-pro-preview",
+      "variant": "max"
+    },
+    "claude-reviewer": {
+      "model": "github-copilot/claude-sonnet-4.5",
+      "variant": "high"
+    },
+    "pr-fixer": {
+      "model": "openai/gpt-5.2-codex",
+      "variant": "xhigh",
+      "temperature": 0.1
+    }
+  },
+  "concurrency": 5,
+  "categories": {
+    "visual-engineering": {
+      "model": "github-copilot/gemini-3-pro-preview",
+      "variant": "high"
+    },
+    "ultrabrain": {
+      "model": "openai/gpt-5.2-codex",
+      "variant": "xhigh"
+    },
+    "artistry": {
+      "model": "github-copilot/gemini-3-pro-preview",
+      "variant": "max"
+    },
+    "quick": {
+      "model": "github-copilot/claude-haiku-4.5"
+    },
+    "middle": {
+      "model": "github-copilot/claude-sonnet-4.5"
+    },
+    "unspecified-low": {
+      "model": "github-copilot/claude-sonnet-4.5",
+      "variant": "medium"
+    },
+    "unspecified-high": {
+      "model": "openai/gpt-5.2",
+      "variant": "medium"
+    },
+    "writing": {
+      "model": "github-copilot/gemini-3-flash-preview"
+    }
+  }
+}

package/@opencode/commands/opencode_attach.json

@@ -0,0 +1,26 @@
+{
+  "instructions": [
+    "AGENTS.md",
+    "ruler/**/*.md"
+  ],
+  "plugin": [
+    "opencode-antigravity-auth",
+    "oh-my-opencode",
+    "opencode-openai-codex-auth"
+  ],
+  "agent": {
+    "quick": {
+      "model": "github-copilot/gpt-5-mini"
+    },
+    "middle": {
+      "model": "github-copilot/claude-sonnet-4.5"
+    }
+  },
+  "permission": {
+    "read": {
+      "*.env": "allow",
+      "*.env.*": "allow"
+    }
+  },  
+  "model": "openai/gpt-5.2"
+}

package/@opencode/commands/opencode_attach.py

@@ -0,0 +1,142 @@
+#!/usr/bin/env python3
+
+import argparse
+import json
+import os
+import shutil
+import sys
+import time
+from pathlib import Path
+
+
+def _is_plain_object(value):
+    return isinstance(value, dict)
+
+
+def deep_merge_in_place(target, source):
+    if not _is_plain_object(target) or not _is_plain_object(source):
+        raise TypeError("deep_merge_in_place expects dicts")
+
+    for key, s_val in source.items():
+        if _is_plain_object(s_val):
+            t_val = target.get(key)
+            if not _is_plain_object(t_val):
+                t_val = {}
+                target[key] = t_val
+            deep_merge_in_place(t_val, s_val)
+        else:
+            target[key] = s_val
+
+    return target
+
+
+def load_json_file(path):
+    raw = path.read_text(encoding="utf-8")
+    return json.loads(raw)
+
+
+def atomic_write_json(path, data):
+    path.parent.mkdir(parents=True, exist_ok=True)
+    tmp_path = path.with_name(f"{path.name}.tmp.{os.getpid()}")
+    serialized = json.dumps(data, ensure_ascii=False, indent=2) + "\n"
+    tmp_path.write_text(serialized, encoding="utf-8")
+    os.replace(tmp_path, path)
+
+
+def backup_file(path):
+    if not path.exists():
+        return None
+    ts = time.strftime("%Y%m%d%H%M%S")
+    bak = path.with_name(f"{path.name}.bak.{ts}")
+    shutil.copy2(path, bak)
+    return bak
+
+
+def attach(source_path, target_path, *, make_backup=True, dry_run=False):
+    source = load_json_file(source_path)
+    if not _is_plain_object(source):
+        raise ValueError(f"Source JSON root must be an object: {source_path}")
+
+    if target_path.exists():
+        target = load_json_file(target_path)
+        if not _is_plain_object(target):
+            raise ValueError(f"Target JSON root must be an object: {target_path}")
+    else:
+        target = {}
+
+    merged = deep_merge_in_place(target, source)
+
+    bak = None
+    if make_backup and target_path.exists() and not dry_run:
+        bak = backup_file(target_path)
+
+    if not dry_run:
+        atomic_write_json(target_path, merged)
+
+    return bak
+
+
+def main(argv):
+    parser = argparse.ArgumentParser(
+        description=(
+            "Attach JSON fragments into OpenCode global config files. "
+            "Rule: deep-merge objects; replace arrays/primitives; preserve other keys."
+        )
+    )
+    parser.add_argument(
+        "--oh-source",
+        default=str(Path(__file__).resolve().parents[1] / "commands" / "oh_attach.json"),
+        help="Path to oh_attach.json",
+    )
+    parser.add_argument(
+        "--opencode-source",
+        default=str(Path(__file__).resolve().parents[1] / "commands" / "opencode_attach.json"),
+        help="Path to opencode_attach.json",
+    )
+    parser.add_argument(
+        "--config-dir",
+        default=str(Path.home() / ".config" / "opencode"),
+        help="Config directory (default: ~/.config/opencode)",
+    )
+    parser.add_argument("--no-backup", action="store_true", help="Do not create .bak files")
+    parser.add_argument("--dry-run", action="store_true", help="Do not write files")
+
+    args = parser.parse_args(argv)
+
+    config_dir = Path(os.path.expanduser(args.config_dir)).resolve()
+    oh_target = config_dir / "oh-my-opencode.json"
+    opencode_target = config_dir / "opencode.json"
+
+    oh_source = Path(args.oh_source).resolve()
+    opencode_source = Path(args.opencode_source).resolve()
+
+    if not oh_source.exists():
+        raise FileNotFoundError(f"Missing source file: {oh_source}")
+    if not opencode_source.exists():
+        raise FileNotFoundError(f"Missing source file: {opencode_source}")
+
+    make_backup = not args.no_backup
+    dry_run = args.dry_run
+
+    bak1 = attach(oh_source, oh_target, make_backup=make_backup, dry_run=dry_run)
+    bak2 = attach(opencode_source, opencode_target, make_backup=make_backup, dry_run=dry_run)
+
+    if dry_run:
+        print("DRY_RUN: no files written")
+        return 0
+
+    if bak1:
+        print(f"backup: {bak1}")
+    if bak2:
+        print(f"backup: {bak2}")
+    print(f"updated: {oh_target}")
+    print(f"updated: {opencode_target}")
+    return 0
+
+
+if __name__ == "__main__":
+    try:
+        raise SystemExit(main(sys.argv[1:]))
+    except Exception as e:
+        print(f"ERROR: {e}", file=sys.stderr)
+        raise SystemExit(1)

package/lib/opencode-initial.js

@@ -27,8 +27,8 @@ async function collectTemplateFiles(dir) {
       }
       if (!entry.isFile()) continue
       const lowerName = entry.name.toLowerCase()
-      // 拷贝 .md 和 .py 文件
-      if (!lowerName.endsWith('.md') && !lowerName.endsWith('.py')) continue
+      // 拷贝 .md / .py / .json 文件
+      if (!lowerName.endsWith('.md') && !lowerName.endsWith('.py') && !lowerName.endsWith('.json')) continue
       // 跳过 Python 编译文件
       if (lowerName.endsWith('.pyc') || lowerName.endsWith('.pyo') || lowerName.endsWith('.pyd')) continue
       out.push(full)
@@ -59,6 +59,7 @@ async function copyTemplateTree({ srcDir, dstDir }) {
   const files = await collectTemplateFiles(srcDir)
   let mdCount = 0
   let pyCount = 0
+  let jsonCount = 0
   
   for (const file of files) {
     const rel = relative(srcDir, file)
@@ -75,10 +76,12 @@ async function copyTemplateTree({ srcDir, dstDir }) {
       } catch {
         // 忽略权限设置失败
       }
+    } else if (file.endsWith('.json')) {
+      jsonCount++
     }
   }
   
-  return { total: files.length, md: mdCount, py: pyCount }
+  return { total: files.length, md: mdCount, py: pyCount, json: jsonCount }
 }
 
 function resolveTemplateRoot(packageRoot) {
@@ -125,6 +128,14 @@ export async function runOpenCodeInitial(options = {}) {
   const commandsStats = await copyTemplateTree({ srcDir: srcCommands, dstDir: dstCommands })
 
   logger.success(`已初始化 OpenCode 模板到: ${dstRoot}`)
-  logger.info(`agents: ${agentsStats.md} 个 .md 文件${agentsStats.py > 0 ? ` + ${agentsStats.py} 个 .py 文件` : ''}`)
-  logger.info(`commands: ${commandsStats.md} 个 .md 文件${commandsStats.py > 0 ? ` + ${commandsStats.py} 个 .py 文件` : ''}`)
+  logger.info(
+    `agents: ${agentsStats.md} 个 .md 文件` +
+      `${agentsStats.py > 0 ? ` + ${agentsStats.py} 个 .py 文件` : ''}` +
+      `${agentsStats.json > 0 ? ` + ${agentsStats.json} 个 .json 文件` : ''}`
+  )
+  logger.info(
+    `commands: ${commandsStats.md} 个 .md 文件` +
+      `${commandsStats.py > 0 ? ` + ${commandsStats.py} 个 .py 文件` : ''}` +
+      `${commandsStats.json > 0 ? ` + ${commandsStats.json} 个 .json 文件` : ''}`
+  )
 }

package/package.json

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