vod-devkit 0.5.9 → 0.5.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +58 -0
- package/QUICKSTART.md +6 -2
- package/README.en.md +23 -2
- package/README.md +204 -16
- package/{contract → assets/contract}/tools.schema.json +127 -1
- package/{skills → assets/skills}/vod-core/SKILL.md +32 -1
- package/bin/vod-devkit +21 -1
- package/integrations/hermes/hooks/vod_guard.py +127 -0
- package/integrations/hermes/hooks/vod_router.py +89 -0
- package/integrations/hermes/host.json +4 -1
- package/npm/cli.js +6 -1
- package/package.json +37 -34
- package/packages/dsh/README.md +60 -0
- package/packages/dsh/package.json +52 -0
- package/plugins/vod-devkit/.codex-plugin/plugin.json +1 -1
- package/plugins/vod-devkit/.mcp.json +2 -0
- package/plugins/vod-devkit/build-info.json +3 -3
- package/plugins/vod-devkit/contract/tools.schema.json +127 -1
- package/plugins/vod-devkit/hooks/vod_guard.py +127 -0
- package/plugins/vod-devkit/hooks/vod_router.py +89 -0
- package/plugins/vod-devkit/skills/vod-core/SKILL.md +32 -1
- package/plugins/vod-devkit/vod_mcp/__init__.py +1 -1
- package/plugins/vod-devkit/vod_mcp/attribution.py +21 -2
- package/plugins/vod-devkit/vod_mcp/config_forms.py +22 -6
- package/plugins/vod-devkit/vod_mcp/diagnose.py +4 -2
- package/plugins/vod-devkit/vod_mcp/host_adapters/base.py +4 -1
- package/plugins/vod-devkit/vod_mcp/host_adapters/codex.py +154 -34
- package/plugins/vod-devkit/vod_mcp/host_adapters/dsh.py +133 -22
- package/plugins/vod-devkit/vod_mcp/host_adapters/hermes.py +216 -59
- package/plugins/vod-devkit/vod_mcp/host_adapters/opencode.py +10 -4
- package/plugins/vod-devkit/vod_mcp/hosts.py +4 -0
- package/plugins/vod-devkit/vod_mcp/net.py +78 -18
- package/plugins/vod-devkit/vod_mcp/packs/__init__.py +97 -22
- package/plugins/vod-devkit/vod_mcp/packs/collect.py +50 -42
- package/plugins/vod-devkit/vod_mcp/packs/core.py +138 -2
- package/plugins/vod-devkit/vod_mcp/paths.py +200 -30
- package/plugins/vod-devkit/vod_mcp/payload.py +10 -5
- package/plugins/vod-devkit/vod_mcp/provenance.py +1 -1
- package/plugins/vod-devkit/vod_mcp/remote_app.py +4 -4
- package/plugins/vod-devkit/vod_mcp/runtime_state.py +151 -28
- package/plugins/vod-devkit/vod_mcp/server.py +52 -7
- package/plugins/vod-devkit/vod_mcp/skills_registry.py +29 -8
- package/plugins/vod-devkit/vod_mcp/tools.py +21 -3
- package/plugins/vod-devkit/vod_mcp/transport_remote.py +22 -3
- package/{vod_mcp → src/vod_mcp}/__init__.py +1 -1
- package/{vod_mcp → src/vod_mcp}/attribution.py +21 -2
- package/{vod_mcp → src/vod_mcp}/config_forms.py +22 -6
- package/{vod_mcp → src/vod_mcp}/diagnose.py +4 -2
- package/{vod_mcp → src/vod_mcp}/host_adapters/base.py +4 -1
- package/{vod_mcp → src/vod_mcp}/host_adapters/codex.py +154 -34
- package/{vod_mcp → src/vod_mcp}/host_adapters/dsh.py +133 -22
- package/src/vod_mcp/host_adapters/hermes.py +361 -0
- package/{vod_mcp → src/vod_mcp}/host_adapters/opencode.py +10 -4
- package/{vod_mcp → src/vod_mcp}/hosts.py +4 -0
- package/{vod_mcp → src/vod_mcp}/net.py +78 -18
- package/src/vod_mcp/packs/__init__.py +142 -0
- package/{vod_mcp → src/vod_mcp}/packs/collect.py +50 -42
- package/src/vod_mcp/packs/core.py +216 -0
- package/src/vod_mcp/paths.py +208 -0
- package/{vod_mcp → src/vod_mcp}/payload.py +10 -5
- package/{vod_mcp → src/vod_mcp}/provenance.py +1 -1
- package/{vod_mcp → src/vod_mcp}/remote_app.py +4 -4
- package/{vod_mcp → src/vod_mcp}/runtime_state.py +151 -28
- package/{vod_mcp → src/vod_mcp}/server.py +52 -7
- package/{vod_mcp → src/vod_mcp}/skills_registry.py +29 -8
- package/{vod_mcp → src/vod_mcp}/tools.py +21 -3
- package/{vod_mcp → src/vod_mcp}/transport_remote.py +22 -3
- package/src/vodkit_cli/auth_cmd.py +81 -0
- package/{vodkit_cli → src/vodkit_cli}/cli.py +38 -8
- package/{vodkit_cli → src/vodkit_cli}/common.py +14 -3
- package/{vodkit_cli → src/vodkit_cli}/doctor.py +147 -9
- package/{vodkit_cli → src/vodkit_cli}/install.py +148 -33
- package/src/vodkit_cli/packs_cmd.py +329 -0
- package/{vodkit_cli → src/vodkit_cli}/remote.py +3 -3
- package/src/vodkit_cli/uninstall.py +315 -0
- package/vod_mcp/host_adapters/__pycache__/__init__.cpython-314.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/__init__.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/atomcode.cpython-314.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/atomcode.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/base.cpython-314.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/base.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/codearts.cpython-314.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/codearts.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/codeartswork.cpython-314.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/codeartswork.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/codex.cpython-314.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/codex.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/codex_desktop.cpython-314.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/codex_desktop.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/dsh.cpython-314.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/dsh.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/generic.cpython-314.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/generic.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/hermes.cpython-314.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/hermes.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/opencode.cpython-314.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/opencode.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/workbuddy.cpython-314.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/workbuddy.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/hermes.py +0 -204
- package/vod_mcp/packs/__init__.py +0 -67
- package/vod_mcp/packs/__pycache__/__init__.cpython-314.pyc +0 -0
- package/vod_mcp/packs/__pycache__/__init__.cpython-39.pyc +0 -0
- package/vod_mcp/packs/__pycache__/collect.cpython-314.pyc +0 -0
- package/vod_mcp/packs/__pycache__/collect.cpython-39.pyc +0 -0
- package/vod_mcp/packs/__pycache__/core.cpython-314.pyc +0 -0
- package/vod_mcp/packs/__pycache__/core.cpython-39.pyc +0 -0
- package/vod_mcp/packs/__pycache__/knowledge.cpython-314.pyc +0 -0
- package/vod_mcp/packs/__pycache__/knowledge.cpython-39.pyc +0 -0
- package/vod_mcp/packs/core.py +0 -80
- package/vod_mcp/paths.py +0 -38
- package/vodkit_cli/__pycache__/__init__.cpython-314.pyc +0 -0
- package/vodkit_cli/__pycache__/__init__.cpython-39.pyc +0 -0
- package/vodkit_cli/__pycache__/cli.cpython-314.pyc +0 -0
- package/vodkit_cli/__pycache__/cli.cpython-39.pyc +0 -0
- package/vodkit_cli/__pycache__/common.cpython-314.pyc +0 -0
- package/vodkit_cli/__pycache__/common.cpython-39.pyc +0 -0
- package/vodkit_cli/__pycache__/doctor.cpython-314.pyc +0 -0
- package/vodkit_cli/__pycache__/doctor.cpython-39.pyc +0 -0
- package/vodkit_cli/__pycache__/install.cpython-314.pyc +0 -0
- package/vodkit_cli/__pycache__/install.cpython-39.pyc +0 -0
- package/vodkit_cli/__pycache__/remote.cpython-314.pyc +0 -0
- package/vodkit_cli/__pycache__/remote.cpython-39.pyc +0 -0
- package/vodkit_cli/__pycache__/uninstall.cpython-314.pyc +0 -0
- package/vodkit_cli/__pycache__/uninstall.cpython-39.pyc +0 -0
- package/vodkit_cli/__pycache__/update.cpython-314.pyc +0 -0
- package/vodkit_cli/__pycache__/update.cpython-39.pyc +0 -0
- package/vodkit_cli/uninstall.py +0 -161
- /package/{safety → assets/safety}/policy.json +0 -0
- /package/{skills → assets/skills}/vod-core/references/acceptance-criteria.md +0 -0
- /package/{skills → assets/skills}/vod-core/references/verification-method.md +0 -0
- /package/{skills → assets/skills}/vod-feedback-collect/SKILL.md +0 -0
- /package/{skills → assets/skills}/vod-feedback-collect/references/acceptance-criteria.md +0 -0
- /package/{skills → assets/skills}/vod-feedback-collect/references/verification-method.md +0 -0
- /package/{skills → assets/skills}/vod-problem-classification-rules/SKILL.md +0 -0
- /package/{skills → assets/skills}/vod-scoring-rules/SKILL.md +0 -0
- /package/{vod_mcp → src/vod_mcp}/detect_framework.py +0 -0
- /package/{vod_mcp → src/vod_mcp}/guardrails.py +0 -0
- /package/{vod_mcp → src/vod_mcp}/host_adapters/__init__.py +0 -0
- /package/{vod_mcp → src/vod_mcp}/host_adapters/atomcode.py +0 -0
- /package/{vod_mcp → src/vod_mcp}/host_adapters/codearts.py +0 -0
- /package/{vod_mcp → src/vod_mcp}/host_adapters/codeartswork.py +0 -0
- /package/{vod_mcp → src/vod_mcp}/host_adapters/codex_desktop.py +0 -0
- /package/{vod_mcp → src/vod_mcp}/host_adapters/generic.py +0 -0
- /package/{vod_mcp → src/vod_mcp}/host_adapters/workbuddy.py +0 -0
- /package/{vod_mcp → src/vod_mcp}/packs/knowledge.py +0 -0
- /package/{vod_mcp → src/vod_mcp}/pending.py +0 -0
- /package/{vod_mcp → src/vod_mcp}/policy.py +0 -0
- /package/{vod_mcp → src/vod_mcp}/runtime.example.json +0 -0
- /package/{vod_mcp → src/vod_mcp}/update_check.py +0 -0
- /package/{vodkit_cli → src/vodkit_cli}/__init__.py +0 -0
- /package/{vodkit_cli → src/vodkit_cli}/update.py +0 -0
|
@@ -1,7 +1,18 @@
|
|
|
1
|
-
"""DeepSeek Harness (dsh) 宿主适配:壳包 dsh-vod-devkit + profile patch
|
|
1
|
+
"""DeepSeek Harness (dsh) 宿主适配:壳包 dsh-vod-devkit + profile patch 托管块。
|
|
2
2
|
|
|
3
|
-
dsh
|
|
3
|
+
D-dsh-mcp-b-1(2026-11-16,参照 huaweicloud-devkit 的成熟做法):dsh 本体自带
|
|
4
|
+
`@deepseek-ai/dsh-mcp-client`,可把 python MCP server 挂成宿主工具(工具名
|
|
5
|
+
`mcp__vod-devkit__vod_*`,12 个工具 / 机器级 state / 两段式全在)。所以:
|
|
6
|
+
|
|
7
|
+
① 有 mcp-client → patch 里写**两条** insert 子项:mcp-client(工具面)+ 壳(只剩 UI 半,
|
|
8
|
+
config 里 registerTools=false),整块用注释标记包裹(幂等替换、卸载只摘自己);
|
|
9
|
+
② 无 mcp-client(版本门槛)→ 只写壳块(6 工具,降级形态,registerTools 缺省 true)。
|
|
10
|
+
|
|
11
|
+
MCP 模式暂只做 stdio;mcp-client 也支持 streamable-http(本机实测通),
|
|
12
|
+
SUPPORTS_REMOTE 仍是 False —— 远程 attach 单独一轮开,避免一次改两处语义。
|
|
4
13
|
"""
|
|
14
|
+
import json
|
|
15
|
+
import os
|
|
5
16
|
import shutil
|
|
6
17
|
import subprocess
|
|
7
18
|
import sys
|
|
@@ -14,6 +25,94 @@ HOST = "dsh"
|
|
|
14
25
|
SUPPORTS_REMOTE = False
|
|
15
26
|
|
|
16
27
|
|
|
28
|
+
def _dsh_root(dsh_cli: str) -> Path:
|
|
29
|
+
"""dsh 本体的安装根(`<root>/lib/...` 形态);mcp-client 装在它的 node_modules 里,
|
|
30
|
+
profile 的 node_modules 里没有——版本门槛必须按这个根探。"""
|
|
31
|
+
return Path(os.path.realpath(dsh_cli)).parent.parent
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+
def _mcp_client_version(dsh_root: Path) -> str | None:
|
|
35
|
+
pkg = dsh_root / "node_modules" / "@deepseek-ai" / "dsh-mcp-client" / "package.json"
|
|
36
|
+
if not pkg.is_file():
|
|
37
|
+
return None
|
|
38
|
+
try:
|
|
39
|
+
return json.loads(pkg.read_text(encoding="utf-8")).get("version") or "unknown"
|
|
40
|
+
except Exception: # noqa: BLE001 坏包按不可用处理,降级而不是崩
|
|
41
|
+
return None
|
|
42
|
+
|
|
43
|
+
|
|
44
|
+
def _ensure_mcp_client(dsh_cli: str, profile: str) -> str | None:
|
|
45
|
+
"""缺 mcp-client 时用 dsh 自己的安装通道补(参照物同做法);可用 env 跳过。"""
|
|
46
|
+
root = _dsh_root(dsh_cli)
|
|
47
|
+
ver = _mcp_client_version(root)
|
|
48
|
+
if ver:
|
|
49
|
+
return ver
|
|
50
|
+
if os.environ.get("VOD_DSH_SKIP_MCP_CLIENT_ADD") == "1":
|
|
51
|
+
print("[vod-devkit] 跳过 mcp-client 自装(VOD_DSH_SKIP_MCP_CLIENT_ADD=1)→ 降级为壳工具面",
|
|
52
|
+
file=sys.stderr)
|
|
53
|
+
return None
|
|
54
|
+
r = subprocess.run([dsh_cli, "plugin", "--profile", profile, "add",
|
|
55
|
+
"@deepseek-ai/dsh-mcp-client"],
|
|
56
|
+
capture_output=True, text=True, timeout=300)
|
|
57
|
+
if r.returncode != 0:
|
|
58
|
+
print("[vod-devkit] mcp-client 自装失败(降级为壳工具面):"
|
|
59
|
+
f"{(r.stderr or r.stdout).strip()[-200:]}", file=sys.stderr)
|
|
60
|
+
return None
|
|
61
|
+
ver = _mcp_client_version(root)
|
|
62
|
+
if ver:
|
|
63
|
+
print(f"已装 @deepseek-ai/dsh-mcp-client@{ver}(工具面走 MCP,12 工具)")
|
|
64
|
+
return ver
|
|
65
|
+
|
|
66
|
+
|
|
67
|
+
def _patch_block(args, mcp_ver: str | None, payload: Path, packs: str) -> str:
|
|
68
|
+
"""生成托管块:标记包裹 + 两条(或一条)insert 子项,全部缩进在 `- insert:` 下。
|
|
69
|
+
|
|
70
|
+
嵌套铁律(真机实锤):块必须缩进在 `- insert:` 之下——平铺会被 dsh 组合层丢弃,
|
|
71
|
+
插件掉出组合树(banner/工具/UI 全消失)。壳的 `name:` 行必须保留(绑定 UI 半)。
|
|
72
|
+
"""
|
|
73
|
+
from vod_mcp import config_forms as cf
|
|
74
|
+
from vod_mcp import paths as _paths
|
|
75
|
+
|
|
76
|
+
prod_yaml = args.product or "''" # schema 是 z.string():YAML null 会校验失败
|
|
77
|
+
shell_cfg = [
|
|
78
|
+
f" product: {prod_yaml}",
|
|
79
|
+
f" apiBase: {args.java_api_base}",
|
|
80
|
+
f" uiBase: {args.java_api_base}", # 浏览器半直连引擎(D-uiBase-direct)
|
|
81
|
+
# headless 无审批通道:dsh 原生 ask 门禁会永久阻断写工具(四宿主实锤)。
|
|
82
|
+
# 同意确认由 SKILL 话术层承担;web 端要硬门禁按 profile 覆盖回 true。
|
|
83
|
+
" confirmWrites: false",
|
|
84
|
+
]
|
|
85
|
+
shell = [" - id: vod-devkit", " name: dsh-vod-devkit", " config:"] + shell_cfg
|
|
86
|
+
if not mcp_ver:
|
|
87
|
+
return "\n".join([cf._DSH_MARK_START, "- insert:"] + shell + [cf._DSH_MARK_END])
|
|
88
|
+
|
|
89
|
+
# B 模式:壳只留 UI 半(工具面交给 mcp-client,避免双注册/双 submit)
|
|
90
|
+
shell_cfg.insert(0, " registerTools: false")
|
|
91
|
+
shell = [" - id: vod-devkit", " name: dsh-vod-devkit", " config:"] + shell_cfg
|
|
92
|
+
mcp = [
|
|
93
|
+
" - id: vod-devkit-mcp",
|
|
94
|
+
" name: '@deepseek-ai/dsh-mcp-client'",
|
|
95
|
+
" config:",
|
|
96
|
+
" serverName: vod-devkit", # 工具名 = mcp__vod-devkit__vod_*
|
|
97
|
+
" transport: stdio",
|
|
98
|
+
# stdio 形态零第三方依赖:用安装器自己的解释器即可(不抄显示层路径)
|
|
99
|
+
f" command: {sys.executable}",
|
|
100
|
+
" args:",
|
|
101
|
+
f" - {payload / 'vod_mcp' / 'server.py'}",
|
|
102
|
+
" env:",
|
|
103
|
+
# mcp-client 只给「清洗过的父环境 + 显式 env」:凭据形状的变量会被丢掉,
|
|
104
|
+
# 所以状态根/引擎地址/packs 必须显式传;key 故意不传(走机器级匿名令牌)。
|
|
105
|
+
f" PYTHONPATH: {payload}",
|
|
106
|
+
f" VOD_DEVKIT_HOME: {_paths.machine_state_home()}",
|
|
107
|
+
f" VOD_JAVA_API_BASE: {args.java_api_base}",
|
|
108
|
+
f" VOD_PACKS: {packs}",
|
|
109
|
+
f" cwd: {payload}",
|
|
110
|
+
" toolCallTimeoutMs: 30000",
|
|
111
|
+
" failOnStartupError: false",
|
|
112
|
+
]
|
|
113
|
+
return "\n".join([cf._DSH_MARK_START, "- insert:"] + mcp + shell + [cf._DSH_MARK_END])
|
|
114
|
+
|
|
115
|
+
|
|
17
116
|
def skills_dir(args):
|
|
18
117
|
prof = (getattr(args, "dsh_profile", "") or "").strip()
|
|
19
118
|
if not prof:
|
|
@@ -44,14 +143,27 @@ def install(args, packs: str) -> Path:
|
|
|
44
143
|
print("[vod-devkit] 未找到 dsh CLI(PATH),拒绝安装(宁可不装不可装错)。"
|
|
45
144
|
"前置:npm i -g @deepseek-ai/dsh(需 pnpm)", file=sys.stderr)
|
|
46
145
|
sys.exit(2)
|
|
47
|
-
|
|
48
|
-
|
|
146
|
+
# 版本必须钉死到本次安装器版本:profile 的 package.json 里是精确版本
|
|
147
|
+
# (`"dsh-vod-devkit": "0.5.9"`),不带版本的 `add dsh-vod-devkit` 会被 pnpm
|
|
148
|
+
# 当成"已满足"直接跳过 —— 真机实锤:0.5.10 装完 profile 里仍是 0.5.9,
|
|
149
|
+
# patch 已写 registerTools:false 而壳里根本没这个字段,工具面静默双注册。
|
|
150
|
+
# 带版本失败(本地开发/离线/registry 未传播)才回落不带版本。
|
|
151
|
+
from vod_mcp import __version__ as _ver
|
|
152
|
+
pkg = f"dsh-vod-devkit@{_ver}"
|
|
153
|
+
r = subprocess.run([dsh, "plugin", "--profile", profile, "add", pkg],
|
|
49
154
|
capture_output=True, text=True, timeout=300)
|
|
155
|
+
if r.returncode != 0:
|
|
156
|
+
print(f"[vod-devkit] dsh plugin add {pkg} 失败,回落不钉版本:"
|
|
157
|
+
f"{(r.stderr or r.stdout).strip()[-200:]}", file=sys.stderr)
|
|
158
|
+
r = subprocess.run([dsh, "plugin", "--profile", profile,
|
|
159
|
+
"add", "dsh-vod-devkit"],
|
|
160
|
+
capture_output=True, text=True, timeout=300)
|
|
50
161
|
if r.returncode != 0:
|
|
51
162
|
print(f"[vod-devkit] dsh plugin add 失败:{(r.stderr or r.stdout).strip()[-300:]}",
|
|
52
163
|
file=sys.stderr)
|
|
53
164
|
sys.exit(1)
|
|
54
|
-
print(f"已安装 dsh 插件 dsh-vod-devkit(profile={profile},
|
|
165
|
+
print(f"已安装 dsh 插件 dsh-vod-devkit(profile={profile},目标版本 {_ver},"
|
|
166
|
+
"dsh plugin list 可见)")
|
|
55
167
|
|
|
56
168
|
patch = Path(host_specs.load("dsh", profile)["configPath"])
|
|
57
169
|
# name 行必须保留:cordis.patch.yml 的 insert 块靠 name 绑定 client 半
|
|
@@ -61,19 +173,15 @@ def install(args, packs: str) -> Path:
|
|
|
61
173
|
# 形态被 dsh 组合层丢弃,插件掉出组合树(banner/工具/UI 全消失)。
|
|
62
174
|
# 归因先验(D-attrib-B):--product 可选;空值时写 '' 而非空值
|
|
63
175
|
# (dsh 壳 config schema 是 z.string().default(''),YAML null 会校验失败)
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
" # requires approval, but no approval channel)。同意确认由 SKILL 话术层\n"
|
|
74
|
-
" # 承担(draft→用户确认→commit / 明确指令直发),web 端如需硬门禁按\n"
|
|
75
|
-
" # profile 覆盖回 true。\n"
|
|
76
|
-
" confirmWrites: false\n")
|
|
176
|
+
# D-dsh-mcp-b-1:B 模式判定——dsh 本体有没有 mcp-client(缺则尝试用 dsh 自己的
|
|
177
|
+
# 安装通道补,补不上就降级成壳工具面)。块本身见 _patch_block。
|
|
178
|
+
mcp_ver = _ensure_mcp_client(dsh, profile)
|
|
179
|
+
from vod_mcp.host_adapters import base as _base
|
|
180
|
+
payload = _base.payload_dir()
|
|
181
|
+
if not payload: # 直调(测试/手工)没 stage:用分发根兜底
|
|
182
|
+
from vod_mcp import paths as _paths
|
|
183
|
+
payload = _paths.DIST_ROOT
|
|
184
|
+
block = _patch_block(args, mcp_ver, Path(payload), packs)
|
|
77
185
|
try:
|
|
78
186
|
written = upsert_patch(patch, block)
|
|
79
187
|
except Exception as e:
|
|
@@ -82,13 +190,15 @@ def install(args, packs: str) -> Path:
|
|
|
82
190
|
# 与真实 IO 失败——两者的处置动作不同,文案必须能分辨。
|
|
83
191
|
print(f"[vod-devkit] 插件已装入 profile={profile},但配置写入失败"
|
|
84
192
|
f"({e.__class__.__name__}: {e};该文件未被改动)。请手动把下段并入 {patch}"
|
|
85
|
-
f"
|
|
193
|
+
f"(托管块:标记行 + `- insert:` 段,已有同标记块则整块原位替换):\n"
|
|
86
194
|
f"{block}", file=sys.stderr)
|
|
87
195
|
sys.exit(1)
|
|
196
|
+
mode = (f"MCP(mcp-client@{mcp_ver},工具面 12 个,壳只留 UI)" if mcp_ver
|
|
197
|
+
else "壳自注册(降级:6 工具)")
|
|
88
198
|
if written:
|
|
89
|
-
print(f"
|
|
199
|
+
print(f"已写入 dsh 托管块({mode}):{patch}")
|
|
90
200
|
else:
|
|
91
|
-
print(f"
|
|
201
|
+
print(f"配置未变化(幂等跳过,{mode}):{patch}")
|
|
92
202
|
return patch
|
|
93
203
|
|
|
94
204
|
|
|
@@ -171,6 +281,7 @@ def remove_patch_block(patch: Path) -> bool:
|
|
|
171
281
|
|
|
172
282
|
|
|
173
283
|
def install_remote(args, url, token):
|
|
174
|
-
print("[vod-devkit] dsh
|
|
284
|
+
print("[vod-devkit] dsh 本轮只支持本地形态(MCP stdio);远程 attach 待下一轮开"
|
|
285
|
+
"(dsh-mcp-client 支持 streamable-http,本机已实测)。请用:"
|
|
175
286
|
"install --target dsh --profile <name>", file=sys.stderr)
|
|
176
287
|
sys.exit(2)
|
|
@@ -0,0 +1,361 @@
|
|
|
1
|
+
"""Hermes 宿主适配:官方 hermes mcp add + 路由插件部署。
|
|
2
|
+
|
|
3
|
+
落点与探测来自 integrations/hermes/host.json(数据驱动,代码里不许出现第二份
|
|
4
|
+
路径字面量);新增 Hermes 特定逻辑只改本模块。
|
|
5
|
+
"""
|
|
6
|
+
import json
|
|
7
|
+
import shutil
|
|
8
|
+
import subprocess
|
|
9
|
+
import sys
|
|
10
|
+
from pathlib import Path
|
|
11
|
+
|
|
12
|
+
from vod_mcp import hosts as host_specs
|
|
13
|
+
from vod_mcp import paths
|
|
14
|
+
from vod_mcp.host_adapters.base import server_env, server_entry
|
|
15
|
+
|
|
16
|
+
HOST = "hermes"
|
|
17
|
+
SUPPORTS_REMOTE = True
|
|
18
|
+
def _spec() -> dict:
|
|
19
|
+
"""调用期现读:host.json 的 ~ 必须在调用期按当前 HOME 解析。
|
|
20
|
+
|
|
21
|
+
2026-11-12 实锤:模块 import 期求值 _MCP_DIR 后,测试里 monkeypatch HOME
|
|
22
|
+
写不到隔离目录,直接把真实 ~/.hermes/mcp/vod-devkit.json 覆盖成了桩值
|
|
23
|
+
(command=/x/vod_mcp/server.py)——真机 doctor 当场读到坏条目。
|
|
24
|
+
"""
|
|
25
|
+
return host_specs.load("hermes")
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
def skills_dir(args):
|
|
29
|
+
return Path(_spec()["skillsDir"])
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
LEGACY_PLUGIN = "vod-feedback-router" # 旧形态(插件包),只用于清理
|
|
33
|
+
HOOK_MARK = "vod_router.py" # 我们这条 shell hook 的识别标志(幂等/摘除共用)
|
|
34
|
+
EVENT = "pre_llm_call"
|
|
35
|
+
HOOK_TIMEOUT = 10
|
|
36
|
+
# 安全面第二条:pre_tool_call(Hermes 把它当**阻塞事件**,stdout 回
|
|
37
|
+
# {"decision":"block"} 或 exit 2 即拦截)。只拦"把 key 读进对话"的动作,
|
|
38
|
+
# 其余一律放行——详见 integrations/hermes/hooks/vod_guard.py。
|
|
39
|
+
GUARD_EVENT = "pre_tool_call"
|
|
40
|
+
GUARD_MARK = "vod_guard.py"
|
|
41
|
+
GUARD_TIMEOUT = 5
|
|
42
|
+
|
|
43
|
+
|
|
44
|
+
def _profile_config() -> Path:
|
|
45
|
+
return Path(_spec()["profileConfig"])
|
|
46
|
+
|
|
47
|
+
|
|
48
|
+
def _hook_script() -> Path:
|
|
49
|
+
return paths.hook_script()
|
|
50
|
+
|
|
51
|
+
|
|
52
|
+
def _hook_command() -> str:
|
|
53
|
+
import shlex
|
|
54
|
+
return f"{shlex.quote(sys.executable)} {shlex.quote(str(_hook_script()))}"
|
|
55
|
+
|
|
56
|
+
|
|
57
|
+
def upsert_hook(text: str, event: str, command: str, timeout: int, mark: str) -> tuple:
|
|
58
|
+
"""把一个 shell hook 写进 config.yaml **文本**的指定事件,返回 (new_text, state)。
|
|
59
|
+
|
|
60
|
+
为什么手改 YAML 文本而不 load/dump:运行时零第三方依赖(无 pyyaml),而
|
|
61
|
+
round-trip dump 会把用户的注释、锚点、顺序全洗掉——那是拿用户的整份配置
|
|
62
|
+
换我们的方便。所以只做"最小结构插入",并且**形态不认识就抛错**(调用方
|
|
63
|
+
打印可粘贴片段,绝不猜着改)。
|
|
64
|
+
|
|
65
|
+
mark 是"这条 hook 属于我们"的识别标志(脚本名),幂等与摘除共用同一条判据。
|
|
66
|
+
|
|
67
|
+
state: unchanged(已有本条)/ added(插进已有事件段)/ created(新建 hooks 段)
|
|
68
|
+
"""
|
|
69
|
+
if command in text and mark in text:
|
|
70
|
+
return (text, "unchanged")
|
|
71
|
+
lines = text.splitlines()
|
|
72
|
+
entries = [f'- command: "{command}"', f' timeout: {timeout}']
|
|
73
|
+
|
|
74
|
+
def _is_ours(line: str) -> bool:
|
|
75
|
+
return mark in line and "command" in line
|
|
76
|
+
|
|
77
|
+
idx_hooks = next((i for i, ln in enumerate(lines) if ln.rstrip() == "hooks:"), None)
|
|
78
|
+
if idx_hooks is None:
|
|
79
|
+
if any(ln.startswith("hooks:") for ln in lines):
|
|
80
|
+
raise RuntimeError("config.yaml 的 hooks 段不是块形态(hooks: 后有值),"
|
|
81
|
+
"拒绝自动插入")
|
|
82
|
+
out = list(lines)
|
|
83
|
+
if out and out[-1].strip():
|
|
84
|
+
out.append("")
|
|
85
|
+
out += ["hooks:", f" {event}:", " " + entries[0], " " + entries[1]]
|
|
86
|
+
return ("\n".join(out) + "\n", "created")
|
|
87
|
+
|
|
88
|
+
if any(_is_ours(ln) for ln in lines):
|
|
89
|
+
return (text, "unchanged")
|
|
90
|
+
|
|
91
|
+
# hooks 段结束位置:下一个缩进为 0 的非空行
|
|
92
|
+
end_hooks = len(lines)
|
|
93
|
+
for j in range(idx_hooks + 1, len(lines)):
|
|
94
|
+
if lines[j].strip() and not lines[j][0].isspace():
|
|
95
|
+
end_hooks = j
|
|
96
|
+
break
|
|
97
|
+
idx_event = next((i for i in range(idx_hooks + 1, end_hooks)
|
|
98
|
+
if lines[i].strip() == f"{event}:"), None)
|
|
99
|
+
if idx_event is None:
|
|
100
|
+
insert_at = idx_hooks + 1
|
|
101
|
+
new_lines = [f" {event}:", " " + entries[0], " " + entries[1]]
|
|
102
|
+
state = "added"
|
|
103
|
+
else:
|
|
104
|
+
# 插到该事件列表末尾:下一个缩进 <= 2 的非空行,或 hooks 段结束
|
|
105
|
+
insert_at = idx_event + 1
|
|
106
|
+
for j in range(idx_event + 1, end_hooks):
|
|
107
|
+
ln = lines[j]
|
|
108
|
+
if not ln.strip():
|
|
109
|
+
continue
|
|
110
|
+
indent = len(ln) - len(ln.lstrip())
|
|
111
|
+
if indent <= 2:
|
|
112
|
+
insert_at = j
|
|
113
|
+
break
|
|
114
|
+
insert_at = j + 1
|
|
115
|
+
new_lines = [" " + entries[0], " " + entries[1]]
|
|
116
|
+
state = "added"
|
|
117
|
+
out = lines[:insert_at] + new_lines + lines[insert_at:]
|
|
118
|
+
return ("\n".join(out) + "\n", state)
|
|
119
|
+
|
|
120
|
+
|
|
121
|
+
def upsert_llm_hook(text: str, command: str, timeout: int = HOOK_TIMEOUT) -> tuple:
|
|
122
|
+
"""预采集路由(pre_llm_call)——薄壳,保留历史签名给已有用例。"""
|
|
123
|
+
return upsert_hook(text, EVENT, command, timeout, HOOK_MARK)
|
|
124
|
+
|
|
125
|
+
|
|
126
|
+
def upsert_guard_hook(text: str, command: str, timeout: int = GUARD_TIMEOUT) -> tuple:
|
|
127
|
+
"""读 Key 拦截(pre_tool_call,阻塞事件)——薄壳。"""
|
|
128
|
+
return upsert_hook(text, GUARD_EVENT, command, timeout, GUARD_MARK)
|
|
129
|
+
|
|
130
|
+
|
|
131
|
+
def remove_hook(text: str, mark: str) -> tuple:
|
|
132
|
+
"""从 config.yaml 文本里摘掉含 mark 的 hook 项(幂等)。返回 (new_text, removed?)。
|
|
133
|
+
|
|
134
|
+
只删含 mark 的 `- command:` 行及其紧随的 `timeout:` 行;其余条目(别人的
|
|
135
|
+
hook、用户的注释、事件段本身若是空的也留着)一律不动——空事件段无害,删别人的
|
|
136
|
+
配置才是有害的。
|
|
137
|
+
"""
|
|
138
|
+
lines = text.splitlines()
|
|
139
|
+
out, removed, i = [], False, 0
|
|
140
|
+
while i < len(lines):
|
|
141
|
+
ln = lines[i]
|
|
142
|
+
if "- command:" in ln and mark in ln:
|
|
143
|
+
removed = True
|
|
144
|
+
i += 1
|
|
145
|
+
if i < len(lines) and lines[i].strip().startswith("timeout:"):
|
|
146
|
+
i += 1
|
|
147
|
+
continue
|
|
148
|
+
out.append(ln)
|
|
149
|
+
i += 1
|
|
150
|
+
return ("\n".join(out) + ("\n" if text.endswith("\n") else ""), removed)
|
|
151
|
+
|
|
152
|
+
|
|
153
|
+
def remove_llm_hook(text: str) -> tuple:
|
|
154
|
+
return remove_hook(text, HOOK_MARK)
|
|
155
|
+
|
|
156
|
+
|
|
157
|
+
def remove_guard_hook(text: str) -> tuple:
|
|
158
|
+
return remove_hook(text, GUARD_MARK)
|
|
159
|
+
|
|
160
|
+
|
|
161
|
+
def _guard_command() -> str:
|
|
162
|
+
import shlex
|
|
163
|
+
return f"{shlex.quote(sys.executable)} {shlex.quote(str(paths.guard_script()))}"
|
|
164
|
+
|
|
165
|
+
|
|
166
|
+
def _register_hooks(cfg_path: Path) -> None:
|
|
167
|
+
"""装两条 shell hook(同一套脚本机制,各自事件注册)。
|
|
168
|
+
|
|
169
|
+
- `pre_llm_call`:预采集意图路由(注入采集纪律),非阻塞;
|
|
170
|
+
- `pre_tool_call`:只拦"读 runtime.json / 导出 VOD_*KEY"的动作,Hermes 的**阻塞**事件。
|
|
171
|
+
|
|
172
|
+
两条都幂等;config.yaml 形态不认识时只打可粘贴片段,绝不猜着重写用户配置。
|
|
173
|
+
单条失败不阻塞另一条(hook 与 MCP 配置是两条独立链)。
|
|
174
|
+
"""
|
|
175
|
+
try:
|
|
176
|
+
text = cfg_path.read_text(encoding="utf-8") if cfg_path.exists() else ""
|
|
177
|
+
except OSError as e:
|
|
178
|
+
print(f"[vod-devkit] warn: 读不到 {cfg_path}({e}),两条 hook 均未注册",
|
|
179
|
+
file=sys.stderr)
|
|
180
|
+
return
|
|
181
|
+
plans = (
|
|
182
|
+
("预采集 hook", EVENT, _hook_command(), HOOK_TIMEOUT, upsert_llm_hook),
|
|
183
|
+
("读 Key 拦截 hook", GUARD_EVENT, _guard_command(), GUARD_TIMEOUT, upsert_guard_hook),
|
|
184
|
+
)
|
|
185
|
+
for label, event, cmd, timeout, upsert in plans:
|
|
186
|
+
try:
|
|
187
|
+
new_text, state = upsert(text, cmd)
|
|
188
|
+
except RuntimeError as e:
|
|
189
|
+
print(f"[vod-devkit] warn: {label}未注册({e})。请手动把下面两行加进 "
|
|
190
|
+
f"{cfg_path} 的 hooks.{event}:\n"
|
|
191
|
+
f" - command: \"{cmd}\"\n timeout: {timeout}", file=sys.stderr)
|
|
192
|
+
continue
|
|
193
|
+
if state != "unchanged":
|
|
194
|
+
try:
|
|
195
|
+
cfg_path.parent.mkdir(parents=True, exist_ok=True)
|
|
196
|
+
cfg_path.write_text(new_text, encoding="utf-8")
|
|
197
|
+
except OSError as e:
|
|
198
|
+
print(f"[vod-devkit] warn: {label}写入失败({e})", file=sys.stderr)
|
|
199
|
+
continue
|
|
200
|
+
text = new_text
|
|
201
|
+
verb = {"created": "已新建 hooks 段", "added": f"已加入 hooks.{event}",
|
|
202
|
+
"unchanged": "已存在"}[state]
|
|
203
|
+
print(f"已注册{label}({cfg_path},{verb};首次使用 hermes 会弹一次同意)")
|
|
204
|
+
|
|
205
|
+
|
|
206
|
+
def remove_legacy_plugin() -> str:
|
|
207
|
+
"""摘旧插件形态(幂等):删目录 + 从 plugins.enabled 去名。
|
|
208
|
+
|
|
209
|
+
为什么必须做:老装机里插件与新的 shell hook 会**同时生效**,每轮注入两段
|
|
210
|
+
指令(模型看到重复要求,行为不可预测)。迁移必须单向收敛到 hook。
|
|
211
|
+
"""
|
|
212
|
+
removed = []
|
|
213
|
+
d = Path.home() / ".hermes" / "plugins" / LEGACY_PLUGIN
|
|
214
|
+
if d.exists():
|
|
215
|
+
shutil.rmtree(d, ignore_errors=True)
|
|
216
|
+
removed.append(f"目录 {d}")
|
|
217
|
+
if shutil.which("hermes"):
|
|
218
|
+
r = subprocess.run(["hermes", "config", "get", "plugins.enabled"],
|
|
219
|
+
capture_output=True, text=True, timeout=60)
|
|
220
|
+
names = []
|
|
221
|
+
for line in (r.stdout or "").splitlines():
|
|
222
|
+
line = line.strip()
|
|
223
|
+
if line.startswith("- "):
|
|
224
|
+
names.append(line[2:].strip())
|
|
225
|
+
elif line.startswith("-"):
|
|
226
|
+
names.append(line[1:].strip())
|
|
227
|
+
if LEGACY_PLUGIN in names:
|
|
228
|
+
keep = [n for n in names if n and n != LEGACY_PLUGIN]
|
|
229
|
+
rr = subprocess.run(["hermes", "config", "set", "plugins.enabled",
|
|
230
|
+
json.dumps(keep)], capture_output=True, text=True, timeout=60)
|
|
231
|
+
if rr.returncode == 0:
|
|
232
|
+
removed.append("plugins.enabled 条目")
|
|
233
|
+
return ";".join(removed)
|
|
234
|
+
|
|
235
|
+
|
|
236
|
+
def install(args, packs: str) -> Path:
|
|
237
|
+
"""Hermes:官方途径 hermes mcp add(config.yaml mcp_servers)。"""
|
|
238
|
+
conf = Path(_spec()["configPath"]).parent / "vod-devkit.json"
|
|
239
|
+
conf.parent.mkdir(parents=True, exist_ok=True)
|
|
240
|
+
conf.write_text(json.dumps({
|
|
241
|
+
"name": "vod-devkit", "command": sys.executable,
|
|
242
|
+
"args": [server_entry()], "env": server_env(args, packs),
|
|
243
|
+
}, ensure_ascii=False, indent=2), encoding="utf-8")
|
|
244
|
+
env_args = []
|
|
245
|
+
for k, v in server_env(args, packs).items():
|
|
246
|
+
env_args.extend([k + "=" + v])
|
|
247
|
+
# 无 CLI 时不裸 exec(FileNotFoundError 会打崩 install):JSON 已落盘,
|
|
248
|
+
# 用户可手工并入 config.yaml —— 缺 CLI 是降级,不是失败。
|
|
249
|
+
if shutil.which("hermes"):
|
|
250
|
+
r = subprocess.run(
|
|
251
|
+
["hermes", "mcp", "add", "vod-devkit", "--command", sys.executable,
|
|
252
|
+
*["--env"] + env_args, "--args", server_entry()],
|
|
253
|
+
input="y\ny\n", capture_output=True, text=True)
|
|
254
|
+
else:
|
|
255
|
+
r = None
|
|
256
|
+
print(f"提示:未找到 hermes CLI(PATH),已写出配置片段:{conf}\n"
|
|
257
|
+
" 将其并入 ~/.hermes/config.yaml 的 mcp_servers 后重启会话生效",
|
|
258
|
+
file=sys.stderr)
|
|
259
|
+
# D-hook-unify-1:预采集路由走 config.yaml 的 hooks.pre_llm_call(shell hook)。
|
|
260
|
+
# 不再装 Python 插件:同一个"stdin JSON → stdout context"脚本可被任何宿主
|
|
261
|
+
# 用各自的机制注册,宿主进程内不需要 import 我们的代码。
|
|
262
|
+
# D-key-guard-4:同一套脚本机制再注册一条 hooks.pre_tool_call(阻塞事件),
|
|
263
|
+
# 只拦"读 runtime.json / 导出 VOD_*KEY"的动作——机制化技能里的"只引指纹"。
|
|
264
|
+
_register_hooks(_profile_config())
|
|
265
|
+
legacy = remove_legacy_plugin()
|
|
266
|
+
if legacy:
|
|
267
|
+
print(f"已清理旧插件形态(避免与新 hook 双份注入):{legacy}")
|
|
268
|
+
if r is None:
|
|
269
|
+
pass # 无 CLI:上面已经给过指引
|
|
270
|
+
elif r.returncode == 0:
|
|
271
|
+
print("已注册 Hermes MCP(hermes mcp list 可见;重启会话生效)")
|
|
272
|
+
else:
|
|
273
|
+
print(f"提示:hermes mcp add 未成功({r.stderr.strip()[:150]});"
|
|
274
|
+
f"可将 {conf} 内容并入 Hermes 配置")
|
|
275
|
+
return conf
|
|
276
|
+
|
|
277
|
+
|
|
278
|
+
def install_remote(args, url, token):
|
|
279
|
+
"""hermes mcp add --url:token 经 env 注入,配置里只留 ${MCP_VOD_DEVKIT_API_KEY} 引用。
|
|
280
|
+
|
|
281
|
+
B1(2026-11-13 真机实锤):hermes mcp add 对已存在条目的交互链是三问
|
|
282
|
+
(Overwrite? → 认证? → Enable all tools?),管道 input 只给两个 y 时第三问
|
|
283
|
+
读不到输入 → hermes 端 Cancelled 且仍 exit 0 → 安装器打印"已注册"但
|
|
284
|
+
config.yaml 纹丝不动(静默假绿)。修法两道:
|
|
285
|
+
①stdin 喂不封顶的 y 流(迭代器持续供给,hermes 问几问答几个——多问多答、
|
|
286
|
+
少问即 EOF 收尾),不再数提示个数;
|
|
287
|
+
②rc=0 不算数——读回 hermes 配置真源(config.yaml mcp_servers.vod-devkit
|
|
288
|
+
的 url),断言远程条目真的写进去了;没写进去就非零退出报"未注册",
|
|
289
|
+
绝不静默。
|
|
290
|
+
"""
|
|
291
|
+
import os
|
|
292
|
+
env = os.environ.copy()
|
|
293
|
+
# token 可选(D-token-machine-1):没有就不注入——请求不带 Bearer,
|
|
294
|
+
# 由远程 server 用机器级匿名令牌提交(同机部署默认形态)。
|
|
295
|
+
if token:
|
|
296
|
+
env["MCP_VOD_DEVKIT_API_KEY"] = token
|
|
297
|
+
|
|
298
|
+
def _yes_forever():
|
|
299
|
+
# 交互问数随 hermes 版本变化(首次装=2 问,覆盖装=3 问),流式供给不数数
|
|
300
|
+
for _ in range(64):
|
|
301
|
+
yield "y\n"
|
|
302
|
+
|
|
303
|
+
r = subprocess.run(
|
|
304
|
+
["hermes", "mcp", "add", "vod-devkit", "--url", url, "--auth", "header"],
|
|
305
|
+
input="".join(_yes_forever()), capture_output=True, text=True, env=env,
|
|
306
|
+
timeout=180)
|
|
307
|
+
# 防静默:读回 config.yaml 断言远程条目在(Cancelled 会 rc=0 但不落配置)
|
|
308
|
+
registered = _hermes_registration_is_remote(url)
|
|
309
|
+
if r.returncode != 0 or not registered:
|
|
310
|
+
reason = (f"hermes mcp add rc={r.returncode},"
|
|
311
|
+
+ ("配置读回未见远程条目(交互确认被跳过即静默取消)" if not registered
|
|
312
|
+
else f"stderr={(r.stderr or '').strip()[-150:]}"))
|
|
313
|
+
print(f"[vod-devkit] Hermes 远程 MCP 注册未落盘:{reason}\n"
|
|
314
|
+
" 可手工执行:hermes mcp add vod-devkit --url <url> --auth header "
|
|
315
|
+
"(逐问回答 y)", file=sys.stderr)
|
|
316
|
+
sys.exit(1)
|
|
317
|
+
conf = Path(_spec()["configPath"]).parent / "vod-devkit.json"
|
|
318
|
+
conf.parent.mkdir(parents=True, exist_ok=True)
|
|
319
|
+
payload = {"name": "vod-devkit", "url": url}
|
|
320
|
+
if token: # 无 token 时不写 headers:请求不带 Bearer,走服务端匿名令牌
|
|
321
|
+
payload["headers"] = {"Authorization": "Bearer ${MCP_VOD_DEVKIT_API_KEY}"}
|
|
322
|
+
conf.write_text(json.dumps(payload, ensure_ascii=False, indent=2), encoding="utf-8")
|
|
323
|
+
print(f"已注册 Hermes 远程 MCP({url};token 存 ~/.hermes/.env,配置内只留引用)")
|
|
324
|
+
return conf
|
|
325
|
+
|
|
326
|
+
|
|
327
|
+
def _hermes_registration_is_remote(url: str) -> bool:
|
|
328
|
+
"""读回 hermes 内部注册真源(config.yaml mcp_servers),断言 vod-devkit 是远程条目。
|
|
329
|
+
|
|
330
|
+
hermes mcp add 写 ~/.hermes/config.yaml 的 mcp_servers.vod-devkit(url 字段
|
|
331
|
+
为远程形态标志);Cancelled 的假绿在这里现形。无 yaml 依赖红线:远端
|
|
332
|
+
安装器零第三方依赖,这里用受限文本扫描(顶层 mcp_servers: 段下缩进块内
|
|
333
|
+
找 vod-devkit 与 url 行),而非完整 yaml 解析。
|
|
334
|
+
"""
|
|
335
|
+
cfg = Path.home() / ".hermes" / "config.yaml"
|
|
336
|
+
if not cfg.is_file():
|
|
337
|
+
return False
|
|
338
|
+
in_section = False
|
|
339
|
+
saw_entry = False
|
|
340
|
+
saw_url = False
|
|
341
|
+
for raw_line in cfg.read_text(encoding="utf-8").splitlines():
|
|
342
|
+
if not raw_line.strip() or raw_line.lstrip().startswith("#"):
|
|
343
|
+
continue
|
|
344
|
+
indented = raw_line[0] == " "
|
|
345
|
+
stripped = raw_line.strip()
|
|
346
|
+
if not indented:
|
|
347
|
+
in_section = stripped.startswith("mcp_servers:")
|
|
348
|
+
continue
|
|
349
|
+
if not in_section:
|
|
350
|
+
continue
|
|
351
|
+
# mcp_servers 段内的行:条目名(一级缩进)与字段(更深缩进)
|
|
352
|
+
if stripped.startswith("vod-devkit:"):
|
|
353
|
+
saw_entry = True
|
|
354
|
+
elif saw_entry and stripped.startswith("url:"):
|
|
355
|
+
if url in stripped:
|
|
356
|
+
saw_url = True
|
|
357
|
+
break
|
|
358
|
+
elif saw_entry and not raw_line.startswith(" vod-devkit") and stripped.endswith(":"):
|
|
359
|
+
if not raw_line.startswith(" " * 4): # 下一个一级条目:停止
|
|
360
|
+
break
|
|
361
|
+
return saw_entry and saw_url
|
|
@@ -43,10 +43,16 @@ def install(args, packs: str) -> Path:
|
|
|
43
43
|
|
|
44
44
|
|
|
45
45
|
def install_remote(args, url, token):
|
|
46
|
-
"""mcp.vod-devkit = {type:remote, url, enabled, headers}(headers 明文,提示权限)。
|
|
46
|
+
"""mcp.vod-devkit = {type:remote, url, enabled, headers?}(headers 明文,提示权限)。
|
|
47
|
+
|
|
48
|
+
token 可选(D-token-machine-1):给了就写 Authorization(调用方自带身份);
|
|
49
|
+
没给就不写 headers——请求无 Bearer,由远程 server 用机器级匿名令牌提交。
|
|
50
|
+
"""
|
|
47
51
|
conf = Path(_SPEC["configPath"])
|
|
48
|
-
entry = {"type": "remote", "url": url, "enabled": True
|
|
49
|
-
|
|
52
|
+
entry = {"type": "remote", "url": url, "enabled": True}
|
|
53
|
+
if token:
|
|
54
|
+
entry["headers"] = {"Authorization": f"Bearer {token}"}
|
|
50
55
|
action = merge_json_mcp(conf, entry)
|
|
51
|
-
|
|
56
|
+
suffix = "(token 随配置存放,注意文件权限)" if token else "(未带 token:走服务端匿名令牌)"
|
|
57
|
+
print(f"已写入 OpenCode 远程 MCP 配置({action}):{conf}{suffix}")
|
|
52
58
|
return conf
|
|
@@ -99,4 +99,8 @@ def load(host: str, profile: str | None = None) -> dict:
|
|
|
99
99
|
for x in raw.get("managedPaths") or []],
|
|
100
100
|
"notes": raw.get("notes") or "",
|
|
101
101
|
}
|
|
102
|
+
# 可选键:宿主的"配置文件本体"落点(如 hermes 的 config.yaml)——
|
|
103
|
+
# 只在一部分宿主上有意义,没写就不出现(不塞 None 让调用方猜)
|
|
104
|
+
if raw.get("profileConfig"):
|
|
105
|
+
spec["profileConfig"] = _resolve(_pick(raw["profileConfig"]), profile)
|
|
102
106
|
return spec
|