homegraph 1.1.1 → 1.1.2

package/dist/installer/targets/deveco.d.ts

@@ -11,12 +11,17 @@
  *
  * Config file resolution (per DevEco Code docs):
  *   - local:  `.deveco/deveco.jsonc` → `deveco.jsonc` (defaults to `.deveco/`)
- *   - global: `~/.config/deveco/deveco.jsonc` (XDG-style;
- *             `%APPDATA%/deveco/deveco.jsonc` on Windows)
+ *   - global: `~/.config/deveco/deveco.jsonc` (XDG-style on EVERY platform,
+ *             Windows included — DevEco uses the same `xdg-basedir` resolution
+ *             as opencode, not `%APPDATA%`)
  *
  * Like Cursor, DevEco Code may launch MCP servers with a cwd that
  * isn't the workspace root, so we inject `--path` into the command
  * array.
+ *
+ * Early homegraph installs wrote the global entry to `%APPDATA%/deveco` on
+ * Windows; DevEco never reads it. install/uninstall sweep stale entries
+ * from that legacy location.
  */
 import { AgentTarget } from './types';
 export declare const devecoTarget: AgentTarget;

package/dist/installer/targets/deveco.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deveco.d.ts","sourceRoot":"","sources":["../../../src/installer/targets/deveco.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAMH,OAAO,EACL,WAAW,EAKZ,MAAM,SAAS,CAAC;AA2LjB,eAAO,MAAM,YAAY,EAAE,WAAgC,CAAC"}
+{"version":3,"file":"deveco.d.ts","sourceRoot":"","sources":["../../../src/installer/targets/deveco.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAMH,OAAO,EACL,WAAW,EAKZ,MAAM,SAAS,CAAC;AAgNjB,eAAO,MAAM,YAAY,EAAE,WAAgC,CAAC"}

package/dist/installer/targets/deveco.js

@@ -12,12 +12,17 @@
  *
  * Config file resolution (per DevEco Code docs):
  *   - local:  `.deveco/deveco.jsonc` → `deveco.jsonc` (defaults to `.deveco/`)
- *   - global: `~/.config/deveco/deveco.jsonc` (XDG-style;
- *             `%APPDATA%/deveco/deveco.jsonc` on Windows)
+ *   - global: `~/.config/deveco/deveco.jsonc` (XDG-style on EVERY platform,
+ *             Windows included — DevEco uses the same `xdg-basedir` resolution
+ *             as opencode, not `%APPDATA%`)
  *
  * Like Cursor, DevEco Code may launch MCP servers with a cwd that
  * isn't the workspace root, so we inject `--path` into the command
  * array.
+ *
+ * Early homegraph installs wrote the global entry to `%APPDATA%/deveco` on
+ * Windows; DevEco never reads it. install/uninstall sweep stale entries
+ * from that legacy location.
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -61,15 +66,23 @@ const jsonc_parser_1 = require("jsonc-parser");
 const shared_1 = require("./shared");
 const instructions_template_1 = require("../instructions-template");
 function globalConfigDir() {
-    if (process.platform === 'win32') {
-        const appData = process.env.APPDATA ?? path.join(os.homedir(), 'AppData', 'Roaming');
-        return path.join(appData, 'deveco');
-    }
     const xdg = process.env.XDG_CONFIG_HOME && process.env.XDG_CONFIG_HOME.trim().length > 0
         ? process.env.XDG_CONFIG_HOME
         : path.join(os.homedir(), '.config');
     return path.join(xdg, 'deveco');
 }
+/**
+ * Early installs wrote the global entry to `%APPDATA%/deveco` on Windows — a
+ * dir DevEco never reads. Returns that legacy dir when it could hold stale
+ * state (APPDATA set and resolving somewhere other than the real config dir).
+ */
+function legacyWindowsConfigDir() {
+    const appData = process.env.APPDATA;
+    if (!appData || !appData.trim())
+        return null;
+    const legacy = path.join(appData, 'deveco');
+    return path.resolve(legacy) === path.resolve(globalConfigDir()) ? null : legacy;
+}
 function configBaseDir(loc) {
     return loc === 'global' ? globalConfigDir() : process.cwd();
 }
@@ -123,8 +136,9 @@ class DevecoTarget {
         const file = configPath(loc);
         const config = parseConfig(readConfigText(file));
         const alreadyConfigured = !!config.mcp?.homegraph;
+        const legacy = legacyWindowsConfigDir();
         const installed = loc === 'global'
-            ? fs.existsSync(globalConfigDir())
+            ? fs.existsSync(globalConfigDir()) || (!!legacy && fs.existsSync(legacy))
             : fs.existsSync(path.join(process.cwd(), '.deveco'))
                 || fs.existsSync(path.join(process.cwd(), 'deveco.jsonc'));
         return { installed, alreadyConfigured, configPath: file };
@@ -135,6 +149,8 @@ class DevecoTarget {
         const instrCleanup = removeInstructionsEntry(loc);
         if (instrCleanup.action === 'removed')
             files.push(instrCleanup);
+        if (loc === 'global')
+            files.push(...cleanupLegacyWindowsState());
         return {
             files,
             notes: ['Restart DevEco Code for MCP changes to take effect.'],
@@ -142,32 +158,10 @@ class DevecoTarget {
     }
     uninstall(loc) {
         const files = [];
-        const file = configPath(loc);
-        if (!fs.existsSync(file)) {
-            files.push({ path: file, action: 'not-found' });
-        }
-        else {
-            const text = readConfigText(file);
-            const config = parseConfig(text);
-            if (!config.mcp?.homegraph) {
-                files.push({ path: file, action: 'not-found' });
-            }
-            else {
-                let edits = (0, jsonc_parser_1.modify)(text, ['mcp', 'homegraph'], undefined, {
-                    formattingOptions: FORMATTING,
-                });
-                let updated = (0, jsonc_parser_1.applyEdits)(text, edits);
-                const afterParsed = parseConfig(updated);
-                if (afterParsed.mcp && typeof afterParsed.mcp === 'object' &&
-                    Object.keys(afterParsed.mcp).length === 0) {
-                    edits = (0, jsonc_parser_1.modify)(updated, ['mcp'], undefined, { formattingOptions: FORMATTING });
-                    updated = (0, jsonc_parser_1.applyEdits)(updated, edits);
-                }
-                (0, shared_1.atomicWriteFileSync)(file, updated);
-                files.push({ path: file, action: 'removed' });
-            }
-        }
+        files.push(removeMcpEntryAt(configPath(loc)));
         files.push(removeInstructionsEntry(loc));
+        if (loc === 'global')
+            files.push(...cleanupLegacyWindowsState());
         return { files };
     }
     printConfig(loc) {
@@ -208,6 +202,42 @@ function writeMcpEntry(loc) {
     (0, shared_1.atomicWriteFileSync)(file, updated);
     return { path: file, action: existed ? 'updated' : 'created' };
 }
+function removeMcpEntryAt(file) {
+    if (!fs.existsSync(file))
+        return { path: file, action: 'not-found' };
+    const text = readConfigText(file);
+    const config = parseConfig(text);
+    if (!config.mcp?.homegraph)
+        return { path: file, action: 'not-found' };
+    let edits = (0, jsonc_parser_1.modify)(text, ['mcp', 'homegraph'], undefined, {
+        formattingOptions: FORMATTING,
+    });
+    let updated = (0, jsonc_parser_1.applyEdits)(text, edits);
+    const afterParsed = parseConfig(updated);
+    if (afterParsed.mcp && typeof afterParsed.mcp === 'object' &&
+        Object.keys(afterParsed.mcp).length === 0) {
+        edits = (0, jsonc_parser_1.modify)(updated, ['mcp'], undefined, { formattingOptions: FORMATTING });
+        updated = (0, jsonc_parser_1.applyEdits)(updated, edits);
+    }
+    (0, shared_1.atomicWriteFileSync)(file, updated);
+    return { path: file, action: 'removed' };
+}
+function cleanupLegacyWindowsState() {
+    const dir = legacyWindowsConfigDir();
+    if (!dir || !fs.existsSync(dir))
+        return [];
+    const out = [];
+    for (const name of ['deveco.jsonc', 'deveco.json']) {
+        const res = removeMcpEntryAt(path.join(dir, name));
+        if (res.action === 'removed')
+            out.push(res);
+    }
+    const agents = path.join(dir, 'AGENTS.md');
+    const action = (0, shared_1.removeMarkedSection)(agents, instructions_template_1.HOMEGRAPH_SECTION_START, instructions_template_1.HOMEGRAPH_SECTION_END);
+    if (action === 'removed')
+        out.push({ path: agents, action });
+    return out;
+}
 function removeInstructionsEntry(loc) {
     const file = instructionsPath(loc);
     const action = (0, shared_1.removeMarkedSection)(file, instructions_template_1.HOMEGRAPH_SECTION_START, instructions_template_1.HOMEGRAPH_SECTION_END);

package/dist/installer/targets/deveco.js.map

@@ -1 +1 @@
-{"version":3,"file":"deveco.js","sourceRoot":"","sources":["../../../src/installer/targets/deveco.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deveco.js","sourceRoot":"","sources":["../../../src/installer/targets/deveco.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homegraph",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Supercharge AI coding agents with semantic code intelligence — surgical context, fewer tool calls, faster answers. 100% local.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/scripts/qa_eval/README.md

@@ -88,15 +88,17 @@ python scripts/qa_eval/run_pipeline.py ab -r /path/to/your/repo
 
 **注意**：`--provider zhipu` 只影响 **builtin Agent** 和 **Judge**；`deveco-code` / `claude-code` 使用各自 CLI 的账号与凭证，不会读取 `ZHIPU_API_KEY`。
 
-DevEco 首次使用或换机后需配置模型：
+DevEco 首次使用需配置模型（凭证保存在用户目录，**不是** DEVECO_HOME）：
 
 ```bash
-deveco providers reset          # 若报 credentials cannot be decrypted
-deveco                          # 打开 TUI，在设置里添加智谱等 provider
-# 或
-deveco providers login
+deveco providers login    # 选 Zhipu AI，输入 API Key
+# 凭证目录（Windows）: C:\Users\<你>\.config\deveco
 ```
 
+TUI 若提示 **DEVECO_HOME**，那是 DevEco **Studio** 安装路径（需 6.1+），仅编译/推包需要；**跑 qa_eval 可跳过**。你当前 Studio 为 5.1，填 `C:\Program Files\Huawei\DevEco Studio` 会校验失败，属正常。
+
+homegraph MCP 写在**被测仓库**的 `.deveco/deveco.jsonc`；智谱 Key 仍读 `~/.config/deveco`。
+
 **Judge 打分**（Stage 2）三种宿主共用，仍需 `ZHIPU_API_KEY` 或 `DASHSCOPE_API_KEY`（与 `--provider` 一致）。
 
 #### 怎么跑
@@ -121,6 +123,8 @@ where deveco
 deveco providers reset   # 仅凭证损坏/换机时需要
 deveco                   # TUI 里配置智谱等模型后再跑评测
 python scripts/qa_eval/run_pipeline.py ab -r /path/to/your/repo --provider zhipu --agent-host deveco-code
+# 指定 DevEco 模型（可选，格式 provider/model）：
+# python scripts/qa_eval/run_pipeline.py ab -r /path/to/your/repo --provider zhipu --agent-host deveco-code --deveco-model zhipuai/glm-4.5-flash
 # → report-deveco.txt
 
 # ④ 三种依次跑（各写各的报告，不会互相覆盖）
@@ -380,7 +384,7 @@ python scripts/qa_eval/run_pipeline.py score \
 | 现象 | 处理 |
 |------|------|
 | Claude 准确率全 < 0.1 / `Not logged in` | Agent 未登录：`claude login` 后重跑；pipeline 现会在首题探测并 fail-fast |
-| `deveco ... exit 1` / `credentials cannot be decrypted` | DevEco 凭证无效：`deveco providers reset` 后在 TUI 重新配置 provider；与 `ZHIPU_API_KEY` 无关 |
+| `deveco-code` exit 1 / `Model not found: glm-4-flash` | `--provider zhipu` 的模型只给 Judge/builtin；deveco 用 `deveco models` 里的 `zhipuai/...` 名，或加 `--deveco-model zhipuai/glm-4.5-flash` |
 | `401` / Judge 全失败 | 检查 API Key：`DASHSCOPE_API_KEY`（DashScope）或 `ZHIPU_API_KEY`（智谱，格式 `id.secret`）；智谱请加 `--provider zhipu`，勿把智谱 Key 设到 `DASHSCOPE_API_KEY` |
 | `Cannot find module 'arkanalyzer'` | `npm run build`，用 `node dist/bin/homegraph.js sync` |
 | `rg not found on PATH` | `sudo apt install ripgrep`（without 臂需要） |

package/scripts/qa_eval/_test_deveco_probe.py

@@ -0,0 +1,41 @@
+#!/usr/bin/env python3
+"""One-off probe: parser + single run_deveco_query. Run from repo root."""
+import sys
+from pathlib import Path
+
+sys.path.insert(0, str(Path(__file__).resolve().parent))
+from external_agent import DEFAULT_DEVECO_MODEL, parse_opencode_json_events, run_deveco_query
+
+SAMPLE = (
+    '{"type":"step_start","part":{"type":"step-start"}}\n'
+    '{"type":"text","part":{"type":"text","text":"\\nOK"}}\n'
+)
+
+def main() -> int:
+    parsed = parse_opencode_json_events(SAMPLE)
+    assert parsed["agent_status"] == "success" and "OK" in parsed["output_answer"], parsed
+    print("parser OK:", parsed["output_answer"])
+
+    repo = Path(r"D:\code\benchmark")
+    if not repo.is_dir():
+        print("skip run: benchmark repo missing")
+        return 0
+
+    print(f"probing run_deveco_query (model={DEFAULT_DEVECO_MODEL}, timeout=90s)...")
+    r = run_deveco_query(
+        repo,
+        "reply OK only",
+        arm="with",
+        hg_bin=None,
+        log_file=None,
+        task_id=0,
+        timeout_sec=90,
+    )
+    print("status:", r.get("agent_status"))
+    print("error:", r.get("agent_error"))
+    print("answer:", (r.get("output_answer") or "")[:200])
+    return 0 if r.get("agent_status") == "success" else 1
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

package/scripts/qa_eval/external_agent.py

@@ -29,8 +29,35 @@ def _strip_ansi(text: str) -> str:
     return re.sub(r"\x1b\[[0-9;]*m", "", text or "")
 
 
+def _extract_deveco_json_errors(text: str) -> str | None:
+    """Parse deveco --format json error lines into a short message."""
+    messages: list[str] = []
+    for line in _strip_ansi(text).splitlines():
+        line = line.strip()
+        if not line.startswith("{"):
+            continue
+        try:
+            ev = json.loads(line)
+        except json.JSONDecodeError:
+            continue
+        if ev.get("type") != "error":
+            continue
+        err = ev.get("error") or {}
+        data = err.get("data") or {}
+        msg = data.get("message") or err.get("message") or err.get("name")
+        if msg and msg not in messages:
+            messages.append(str(msg))
+    if not messages:
+        return None
+    return "; ".join(messages)
+
+
 def _cli_error_summary(stderr: str, stdout: str, *, max_len: int = 400) -> str:
     """Pick a short user-facing error from CLI stderr/stdout."""
+    for raw in (stderr, stdout):
+        deveco_err = _extract_deveco_json_errors(raw)
+        if deveco_err:
+            return deveco_err[:max_len]
     for raw in (stderr, stdout):
         clean = _strip_ansi(raw).strip()
         if not clean:
@@ -63,7 +90,11 @@ def auth_failure_reason(text: str) -> str | None:
             "DevEco Code 未配置或凭证无效。请运行: deveco providers reset，"
             "然后重新登录/配置 provider"
         )
-    if "invalid api key" in t or "incorrect api key" in t:
+    if "model not found" in t:
+        return (
+            "DevEco 模型名无效。deveco 需要 provider/model 格式（如 zhipuai/glm-4.5-flash），"
+            "可用 `deveco models` 查看；勿把 Judge 的 --model 直接传给 deveco"
+        )
         return "API Key 无效"
     if "authentication required" in t or "unauthorized" in t:
         return "未授权，请检查登录或 API Key"
@@ -104,6 +135,19 @@ def find_deveco_cli() -> str:
     )
 
 
+def _popen_capture(cmd: list[str], *, cwd: str) -> subprocess.Popen:
+    """Run CLI with UTF-8 stdout/stderr (Windows default locale is often GBK)."""
+    return subprocess.Popen(
+        cmd,
+        cwd=cwd,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        text=True,
+        encoding="utf-8",
+        errors="replace",
+    )
+
+
 def write_mcp_config(path: Path, *, hg_command: str, hg_args: list[str]) -> None:
     path.write_text(
         json.dumps({"mcpServers": {"homegraph": {"command": hg_command, "args": hg_args}}}, indent=2)
@@ -188,6 +232,7 @@ def parse_opencode_json_events(raw: str) -> dict[str, Any]:
     total_tokens = 0
     max_turn = 0
     duration_ms = 0
+    stream_errors: list[str] = []
 
     for line in raw.splitlines():
         line = line.strip()
@@ -199,7 +244,37 @@ def parse_opencode_json_events(raw: str) -> dict[str, Any]:
             continue
 
         ev_type = ev.get("type") or ev.get("event")
-        if ev_type in ("message", "assistant", "text"):
+        part = ev.get("part") if isinstance(ev.get("part"), dict) else {}
+
+        if ev_type == "error":
+            err = ev.get("error") or {}
+            data = err.get("data") or {}
+            msg = data.get("message") or err.get("message") or err.get("name")
+            if msg:
+                stream_errors.append(str(msg))
+
+        # DevEco / opencode stream-json: {type:"text", part:{type:"text", text:"..."}}
+        if ev_type == "text" and part.get("text"):
+            text = str(part["text"]).strip()
+            if text:
+                answer_parts.append(text)
+                max_turn += 1
+
+        part_type = part.get("type") or ""
+        if ev_type in ("tool", "tool_call", "tool_use") or part_type in (
+            "tool",
+            "tool-invocation",
+            "tool_use",
+            "tool-call",
+        ):
+            max_turn += 1
+            name = part.get("tool") or part.get("name") or ev.get("tool") or "?"
+            inp = part.get("input") or part.get("args") or part.get("state") or ev.get("input") or {}
+            tool_trace.append(
+                f"---\n{name}\nargs: {json.dumps(inp, ensure_ascii=False)[:500]}\n---"
+            )
+
+        if ev_type in ("message", "assistant"):
             content = ev.get("content") or ev.get("text") or ev.get("message")
             if isinstance(content, str) and content.strip():
                 answer_parts.append(content.strip())
@@ -225,6 +300,10 @@ def parse_opencode_json_events(raw: str) -> dict[str, Any]:
         if ev.get("duration_ms"):
             duration_ms = max(duration_ms, int(ev["duration_ms"]))
 
+        part_time = part.get("time") if isinstance(part.get("time"), dict) else {}
+        if part_time.get("start") and part_time.get("end"):
+            duration_ms = max(duration_ms, int(part_time["end"]) - int(part_time["start"]))
+
     answer = "\n".join(answer_parts).strip()
     output = "\n\n".join(tool_trace + ([answer] if answer else []))
     auth_err = auth_failure_reason(answer) or auth_failure_reason(raw)
@@ -237,9 +316,19 @@ def parse_opencode_json_events(raw: str) -> dict[str, Any]:
             "agent_duration_ms": duration_ms,
             "agent_usage": {"total_tokens": total_tokens} if total_tokens else {},
         }
+    if stream_errors and not answer:
+        return {
+            "output_answer": output,
+            "agent_status": "error",
+            "agent_error": "; ".join(stream_errors),
+            "agent_turns": max_turn,
+            "agent_duration_ms": duration_ms,
+            "agent_usage": {"total_tokens": total_tokens} if total_tokens else {},
+        }
     return {
         "output_answer": output,
         "agent_status": "success" if answer else "error",
+        "agent_error": None if answer else "deveco 未返回可解析的文本回答",
         "agent_turns": max_turn,
         "agent_duration_ms": duration_ms,
         "agent_usage": {"total_tokens": total_tokens} if total_tokens else {},
@@ -305,13 +394,7 @@ def run_claude_query(
         _log_line(log_file, "the 1 turn")
         t0 = time.time()
 
-        proc = subprocess.Popen(
-            cmd,
-            cwd=str(repo),
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True,
-        )
+        proc = _popen_capture(cmd, cwd=str(repo))
         with sample_memory(proc.pid) as sampler:
             try:
                 stdout, stderr = proc.communicate(timeout=timeout_sec)
@@ -329,7 +412,7 @@ def run_claude_query(
                 }
         mem = sampler.last_stats
 
-        if proc.returncode != 0 and not stdout.strip():
+        if proc.returncode != 0 and not (stdout or "").strip():
             _log_memory(log_file, mem)
             return {
                 "output_answer": (stderr or "")[:2000],
@@ -352,7 +435,7 @@ def run_claude_query(
                 "agent_host": HOST_CLAUDE,
                 "agent_memory_mb": mem,
             }
-        parsed = parse_claude_stream_json(stdout)
+        parsed = parse_claude_stream_json(stdout or "")
         tokens = (parsed.get("agent_usage") or {}).get("total_tokens") or 0
         if tokens:
             _log_line(log_file, f"totalTokenCount = {tokens}")
@@ -369,6 +452,41 @@ def run_claude_query(
         }
 
 
+def _deveco_project_config_dir(repo: Path) -> Path:
+    """Project-level deveco config (read before ~/.config/deveco/deveco.jsonc)."""
+    return repo / ".deveco"
+
+
+def _write_deveco_project_mcp(repo: Path, *, arm: str, hg_bin: str) -> Path:
+    """Write repo/.deveco/deveco.jsonc for MCP only; credentials stay in ~/.config/deveco."""
+    config_dir = _deveco_project_config_dir(repo)
+    config_dir.mkdir(parents=True, exist_ok=True)
+    config_path = config_dir / "deveco.jsonc"
+    if arm == "with":
+        if not hg_bin:
+            from agent_runner import find_homegraph_bin
+
+            hg_bin = find_homegraph_bin(None)
+        cmd, base_args = _split_hg_bin(hg_bin)
+        body = {
+            "$schema": "https://opencode.ai/config.json",
+            "mcp": {
+                "homegraph": {
+                    "type": "local",
+                    "command": [cmd, *base_args, "--path", str(repo.resolve())],
+                    "enabled": True,
+                }
+            },
+        }
+    else:
+        body = {"$schema": "https://opencode.ai/config.json", "mcp": {}}
+    config_path.write_text(json.dumps(body, indent=2) + "\n", encoding="utf-8")
+    return config_path
+
+
+DEFAULT_DEVECO_MODEL = "zhipuai/glm-4.5-flash"
+
+
 def run_deveco_query(
     repo: Path,
     query: str,
@@ -383,33 +501,7 @@ def run_deveco_query(
     cli = find_deveco_cli()
     backend = f"deveco-code-{'with' if arm == 'with' else 'without'}-homegraph"
 
-    config_dir = repo / ".qa_eval_deveco"
-    config_dir.mkdir(exist_ok=True)
-    config_path = config_dir / "opencode.jsonc"
-    if arm == "with":
-        cmd, base_args = _split_hg_bin(hg_bin)
-        config_path.write_text(
-            json.dumps(
-                {
-                    "$schema": "https://opencode.ai/config.json",
-                    "mcp": {
-                        "homegraph": {
-                            "type": "local",
-                            "command": [cmd, *base_args, "--path", str(repo.resolve())],
-                            "enabled": True,
-                        }
-                    },
-                },
-                indent=2,
-            )
-            + "\n",
-            encoding="utf-8",
-        )
-    else:
-        config_path.write_text(
-            '{"$schema":"https://opencode.ai/config.json","mcp":{}}\n',
-            encoding="utf-8",
-        )
+    _write_deveco_project_mcp(repo, arm=arm, hg_bin=hg_bin)
 
     run_cmd = [
         cli,
@@ -423,19 +515,14 @@ def run_deveco_query(
     ]
     if model:
         run_cmd.extend(["--model", model])
+    else:
+        run_cmd.extend(["--model", DEFAULT_DEVECO_MODEL])
 
     _log_line(log_file, f"Evaluate {task_id}:")
     _log_line(log_file, "the 1 turn")
     t0 = time.time()
 
-    proc = subprocess.Popen(
-        run_cmd,
-        cwd=str(repo),
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-        text=True,
-        env={**os.environ, "XDG_CONFIG_HOME": str(config_dir)},
-    )
+    proc = _popen_capture(run_cmd, cwd=str(repo))
     with sample_memory(proc.pid) as sampler:
         try:
             stdout, stderr = proc.communicate(timeout=timeout_sec)
@@ -469,14 +556,16 @@ def run_deveco_query(
         }
 
     _log_line(log_file, "first token")
-    parsed = parse_opencode_json_events(stdout if stdout.strip() else stderr)
+    out = (stdout or "").strip()
+    err = (stderr or "").strip()
+    parsed = parse_opencode_json_events(out if out else err)
     tokens = (parsed.get("agent_usage") or {}).get("total_tokens") or 0
     if tokens:
         _log_line(log_file, f"totalTokenCount = {tokens}")
     _log_memory(log_file, mem)
 
     duration_ms = parsed.get("agent_duration_ms") or int((time.time() - t0) * 1000)
-    return {
+    result = {
         **parsed,
         "agent_duration_ms": duration_ms,
         "agent_backend": backend,
@@ -484,6 +573,9 @@ def run_deveco_query(
         "ab_arm": "with-homegraph" if arm == "with" else "without-homegraph",
         "agent_memory_mb": mem,
     }
+    if result.get("agent_status") != "success" and not result.get("agent_error"):
+        result["agent_error"] = _extract_deveco_json_errors(combined) or "deveco 未返回可解析的文本回答"
+    return result
 
 
 def run_external_dataset(
@@ -569,6 +661,8 @@ def run_external_dataset(
                 if i == 1 and meta.get("agent_error") and (
                     "未登录" in str(meta["agent_error"])
                     or "DevEco Code" in str(meta["agent_error"])
+                    or "DevEco 模型" in str(meta["agent_error"])
+                    or "Model not found" in str(meta["agent_error"])
                 ):
                     auth_abort = str(meta["agent_error"])
                     print(f"\n  ✗ {auth_abort} — 后续题目跳过", flush=True)

package/scripts/qa_eval/run_pipeline.py

@@ -396,6 +396,7 @@ def run_agent_stage(
     llm,
     hg_bin: str | None,
     max_turns: int,
+    deveco_model: str | None = None,
 ) -> None:
     if agent_host == HOST_CLAUDE:
         verify_claude_login()
@@ -428,7 +429,7 @@ def run_agent_stage(
                 output=out,
                 log_file=log,
                 hg_bin=hg_bin or "",
-                model=llm.model if agent_host == HOST_DEVECO else None,
+                model=deveco_model if agent_host == HOST_DEVECO else None,
             )
 
 
@@ -497,6 +498,7 @@ def cmd_ab(args: argparse.Namespace) -> int:
             llm=llm,
             hg_bin=args.homegraph_bin,
             max_turns=args.max_turns,
+            deveco_model=getattr(args, "deveco_model", None),
         )
 
     if not args.no_judge:
@@ -605,6 +607,7 @@ def cmd_hosts(args: argparse.Namespace) -> int:
             no_judge=args.no_judge,
             report=None,
             agent_host=host,
+            deveco_model=getattr(args, "deveco_model", None),
         )
         if cmd_ab(host_args) != 0:
             rc = 1
@@ -653,6 +656,11 @@ def main() -> int:
     p_ab.add_argument("--base-url", default=None, help="OpenAI 兼容 API 端点（默认随 provider）")
     p_ab.add_argument("--homegraph-bin", default=None)
     p_ab.add_argument("--max-turns", type=int, default=8, help="Agent 最多工具轮次")
+    p_ab.add_argument(
+        "--deveco-model",
+        default=None,
+        help="DevEco Agent 模型（provider/model，如 zhipuai/glm-4.5-flash）；默认用 DevEco 自身配置，不用 --model",
+    )
     p_ab.add_argument("--no-agent", action="store_true", help="不跑 Agent，沿用已有 JSONL")
     p_ab.add_argument("--no-judge", action="store_true", help="不跑 Judge，沿用已有 scored")
     p_ab.add_argument(
@@ -676,6 +684,7 @@ def main() -> int:
     p_hosts.add_argument("--base-url", default=None)
     p_hosts.add_argument("--homegraph-bin", default=None)
     p_hosts.add_argument("--max-turns", type=int, default=8)
+    p_hosts.add_argument("--deveco-model", default=None)
     p_hosts.add_argument("--no-agent", action="store_true")
     p_hosts.add_argument("--no-judge", action="store_true")
     p_hosts.add_argument(