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
|
@@ -0,0 +1,216 @@
|
|
|
1
|
+
"""core pack:自述、认证自检、版本提醒、产品候选检索(只读,零写盘副作用)。
|
|
2
|
+
|
|
3
|
+
例外:`auth_ensure` 是唯一有写盘副作用的认证工具(领匿名令牌后落 state),
|
|
4
|
+
显式 key 一律不覆盖、远程面不领取(见 D-token-machine-1)。
|
|
5
|
+
"""
|
|
6
|
+
import os
|
|
7
|
+
|
|
8
|
+
from vod_mcp import attribution as _attrib
|
|
9
|
+
from vod_mcp import net, provenance
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
def search_products(params: dict) -> dict:
|
|
13
|
+
"""产品候选检索(只读):给模型 3-5 个候选去问用户,而不是从名录里瞎猜。
|
|
14
|
+
名录=引擎 meta 接口的 productCatalog(长度随运营变更,插件不内置)。"""
|
|
15
|
+
query = str(params.get("query") or "").strip()
|
|
16
|
+
limit = int(params.get("limit") or 5)
|
|
17
|
+
limit = max(1, min(limit, 20))
|
|
18
|
+
meta = net._load_meta()
|
|
19
|
+
catalog = meta.get("catalog") or []
|
|
20
|
+
if not query:
|
|
21
|
+
return {"candidates": [], "total": len(catalog)}
|
|
22
|
+
idx = _attrib.build_alias_index(meta)
|
|
23
|
+
hits = _attrib.match_products(query, idx)
|
|
24
|
+
seen, cands = set(), []
|
|
25
|
+
for h in hits:
|
|
26
|
+
pid = str(h.get("id") or "")
|
|
27
|
+
if not pid or pid in seen:
|
|
28
|
+
continue
|
|
29
|
+
seen.add(pid)
|
|
30
|
+
cands.append({"id": pid, "name": h["product"],
|
|
31
|
+
"score": round(min(1.0, len(h["alias"]) / max(len(query), 1)), 2),
|
|
32
|
+
"matchReason": f"alias:{h['alias']}"})
|
|
33
|
+
if not cands: # 别名没命中:退回名字子串(用户可能打错/只说一半)
|
|
34
|
+
q = query.lower()
|
|
35
|
+
for item in catalog:
|
|
36
|
+
name = str(item.get("name") or "")
|
|
37
|
+
if q and (q in name.lower() or name.lower() in q):
|
|
38
|
+
cands.append({"id": str(item.get("id")), "name": name, "score": 0.5,
|
|
39
|
+
"matchReason": "name-substring"})
|
|
40
|
+
if not cands: # 完全无关联词:给名录前 N 个当"可选项"(问用户用)
|
|
41
|
+
for item in catalog[:limit]:
|
|
42
|
+
cands.append({"id": str(item.get("id")), "name": str(item.get("name") or ""),
|
|
43
|
+
"score": 0.0, "matchReason": "catalog-default"})
|
|
44
|
+
cands.sort(key=lambda c: (c["score"], len(c["name"])), reverse=True)
|
|
45
|
+
return {"candidates": cands[:limit], "total": len(catalog)}
|
|
46
|
+
|
|
47
|
+
|
|
48
|
+
def devkit_info(params: dict, client_info: dict | None = None) -> dict:
|
|
49
|
+
return provenance.info_payload(client_info)
|
|
50
|
+
|
|
51
|
+
|
|
52
|
+
def _pack_ids(v) -> list:
|
|
53
|
+
if isinstance(v, str):
|
|
54
|
+
return [x.strip() for x in v.split(",") if x.strip()]
|
|
55
|
+
if isinstance(v, (list, tuple)):
|
|
56
|
+
return [str(x) for x in v]
|
|
57
|
+
return []
|
|
58
|
+
|
|
59
|
+
|
|
60
|
+
def packs_configure(params: dict, client_info: dict | None = None) -> dict:
|
|
61
|
+
"""会话内开关能力包(stdio 面;远程面在 REMOTE_WITHHELD 里被摘除)。
|
|
62
|
+
|
|
63
|
+
只改进程内状态:不写 env、不写宿主配置(持久化面是 CLI `packs
|
|
64
|
+
enable|disable --apply`,一个概念只留一个写入口)。返回新生效面 + 工具清单,
|
|
65
|
+
由 server 侧推 tools/list_changed。
|
|
66
|
+
"""
|
|
67
|
+
from vod_mcp import packs as _packs
|
|
68
|
+
reset = bool(params.get("reset"))
|
|
69
|
+
enable = _pack_ids(params.get("enable") or [])
|
|
70
|
+
disable = _pack_ids(params.get("disable") or [])
|
|
71
|
+
if not reset and not enable and not disable:
|
|
72
|
+
raise net.ToolError("参数为空:给 enable / disable(包 id)或 reset=true", code=-32602)
|
|
73
|
+
current = _packs.effective_packs()
|
|
74
|
+
try:
|
|
75
|
+
if reset:
|
|
76
|
+
new = _packs.set_runtime_packs(None)
|
|
77
|
+
else:
|
|
78
|
+
want = [p for p in current if p not in set(disable)] + enable
|
|
79
|
+
new = _packs.set_runtime_packs(want)
|
|
80
|
+
except _packs.UnknownPack as e:
|
|
81
|
+
raise net.ToolError(str(e), code=-32602) from e
|
|
82
|
+
except _packs.PackRefused as e:
|
|
83
|
+
# 安全门禁拒绝(熔断):不是参数错,别让模型以为改个拼写就能开
|
|
84
|
+
raise net.ToolError(str(e), code=-32015) from e
|
|
85
|
+
added = [p for p in new if p not in current]
|
|
86
|
+
removed = [p for p in current if p not in new]
|
|
87
|
+
return {
|
|
88
|
+
"packs": list(new),
|
|
89
|
+
"added": added,
|
|
90
|
+
"removed": removed,
|
|
91
|
+
"tools": _packs.enabled_tools(),
|
|
92
|
+
"changed": bool(added or removed),
|
|
93
|
+
"persisted": False,
|
|
94
|
+
"note": ("会话内生效、重启即清;持久化用 CLI:"
|
|
95
|
+
"vod-devkit packs enable|disable <id> --apply"),
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
|
|
99
|
+
def auth_status(params: dict, client_info: dict | None = None) -> dict:
|
|
100
|
+
"""认证自检:指纹化输出(明文永不出现),无 key 也跑并给引导。
|
|
101
|
+
|
|
102
|
+
远程面(HTTP)缺陷修正:keyCheck 探针旧实现只看本地 net.JAVA_KEY(env/runtime),
|
|
103
|
+
远程面没有本地 key 时 keyCheck 永远 null——远程 agent 永远无法验证自己
|
|
104
|
+
请求头里的 key(真实场景:坏 key 装上、提交才 401)。修法:服务面下探
|
|
105
|
+
net._eff_key()(请求头 Bearer),本地态 javaKey 段照实报"本机未配置",另加
|
|
106
|
+
requestKey 段报请求头 key 的指纹与探针结果——身份随请求走,两段不混。
|
|
107
|
+
"""
|
|
108
|
+
req_key = net._eff_key() if net._SERVER_FACE.get() else None
|
|
109
|
+
out = {
|
|
110
|
+
"javaKey": net._key_state(),
|
|
111
|
+
"packs": sorted(__import__("vod_mcp.packs", fromlist=["effective_packs"]).effective_packs()),
|
|
112
|
+
}
|
|
113
|
+
if req_key:
|
|
114
|
+
out["requestKey"] = {"fingerprint": net._fingerprint(req_key),
|
|
115
|
+
"note": "服务面:身份来自请求头 Bearer"}
|
|
116
|
+
# 探针显式传请求头 key(net.probe_key 默认取本地 net.JAVA_KEY——服务面必须覆盖)
|
|
117
|
+
out["keyCheck"] = net.probe_key(req_key)
|
|
118
|
+
elif net.JAVA_KEY:
|
|
119
|
+
# 主动探针(devkit auth init 真调 IAM 的廉价版):用户问"key 好没好"有确定答案
|
|
120
|
+
out["keyCheck"] = net.probe_key()
|
|
121
|
+
if net._explicit_key():
|
|
122
|
+
# 旧版残留凭据检测位(评审拍板项):显式 key 存活即在位提示自愈路径,
|
|
123
|
+
# 不等提交撞 401 才发现(codex 0.2.3 残留 key 挡匿名链的实锤教训)
|
|
124
|
+
out["legacyKeyHint"] = net._legacy_key_hint()
|
|
125
|
+
if not net.JAVA_KEY and not req_key:
|
|
126
|
+
out["guidance"] = net._KEY_GUIDANCE
|
|
127
|
+
out["tokenReady"] = "首次提交时将自动申请匿名令牌(零字段,日限额低)"
|
|
128
|
+
return out
|
|
129
|
+
|
|
130
|
+
|
|
131
|
+
def check_update(params: dict, client_info: dict | None = None) -> dict:
|
|
132
|
+
from vod_mcp import update_check as uc
|
|
133
|
+
return uc.check(params)
|
|
134
|
+
|
|
135
|
+
|
|
136
|
+
def auth_ensure(params: dict, client_info: dict | None = None) -> dict:
|
|
137
|
+
"""判 + 领(D-token-machine-1):幂等,显式 key 一律不覆盖。
|
|
138
|
+
|
|
139
|
+
与 auth_status 的分工:status 只读,ensure 是唯一的"需要时替你领一枚"入口。
|
|
140
|
+
判定表(返回值 source 指明身份从哪来,方便事后审计):
|
|
141
|
+
· VOD_JAVA_API_KEY 显式存在 → 只探针,source=env,绝不覆盖
|
|
142
|
+
· runtime 有令牌且 verified → source=runtime,changed=false(不重复领)
|
|
143
|
+
· no-key / expired-anonymous /
|
|
144
|
+
device-mismatch → 领零字段匿名令牌 → 落 state → 复探
|
|
145
|
+
· rejected(显式 key 被引擎拒) → **不领**,fail fast(不静默降档)
|
|
146
|
+
· unreachable → **不领**,verified=null(网络问题不是身份问题)
|
|
147
|
+
|
|
148
|
+
远程面同样是这套语义(D-token-machine-1 定稿:本地/远程同一个效果):
|
|
149
|
+
请求头 Bearer 优先(调用方自带身份就用它);没有就由服务端领/复用机器级匿名令牌。
|
|
150
|
+
多租户部署要按调用方隔离时,各调用方带自己的 Bearer;匿名档就是"整机一份"的低信任档。
|
|
151
|
+
"""
|
|
152
|
+
from vod_mcp import runtime_state as rt
|
|
153
|
+
|
|
154
|
+
req_key = net._eff_key() if net._SERVER_FACE.get() else None
|
|
155
|
+
has_key = bool(req_key) or bool(net._java_key())
|
|
156
|
+
# source 要能回答问题"这身份是哪来的":运行时显式 key(auth init 写入)、
|
|
157
|
+
# 请求头身份、自动领的匿名令牌不是一回事——被拒后的处置也不同。
|
|
158
|
+
if req_key:
|
|
159
|
+
source = "request"
|
|
160
|
+
elif os.environ.get("VOD_JAVA_API_KEY"):
|
|
161
|
+
source = "env"
|
|
162
|
+
elif has_key and net._explicit_key():
|
|
163
|
+
source = "runtime-key"
|
|
164
|
+
elif has_key:
|
|
165
|
+
source = "runtime-anonymous"
|
|
166
|
+
else:
|
|
167
|
+
source = "none"
|
|
168
|
+
|
|
169
|
+
if source in ("runtime-anonymous", "new-anonymous"):
|
|
170
|
+
tier = "anonymous"
|
|
171
|
+
elif source == "none":
|
|
172
|
+
tier = "none"
|
|
173
|
+
else:
|
|
174
|
+
tier = "formal"
|
|
175
|
+
|
|
176
|
+
probe = (net.probe_key(req_key) if req_key
|
|
177
|
+
else (net.probe_key() if has_key else
|
|
178
|
+
{"ok": None, "reason": "no-key", "fingerprint": None}))
|
|
179
|
+
if probe.get("ok") is True:
|
|
180
|
+
return {"tier": tier, "source": source, "verified": True,
|
|
181
|
+
"reason": probe.get("reason"), "fingerprint": probe.get("fingerprint"),
|
|
182
|
+
"changed": False, "base": net._java_base()}
|
|
183
|
+
|
|
184
|
+
reason = probe.get("reason")
|
|
185
|
+
# 显式身份被拒:配置错误必须冒出来,静默换匿名 = 归因/额度双错位。
|
|
186
|
+
# 显式=请求头 Bearer / env key / runtime 里的正式 key(tier≠anonymous)。
|
|
187
|
+
if reason == "rejected" and (req_key or os.environ.get("VOD_JAVA_API_KEY")
|
|
188
|
+
or net._explicit_key()):
|
|
189
|
+
return {"tier": tier, "source": source, "verified": False, "reason": "rejected",
|
|
190
|
+
"fingerprint": probe.get("fingerprint"), "changed": False,
|
|
191
|
+
"base": net._java_base(),
|
|
192
|
+
"guidance": [{"action": "fix-key", "label": "显式 key 被引擎拒绝:换一把有效 key"
|
|
193
|
+
"(auth init --key … --apply),不要落到匿名档"}]}
|
|
194
|
+
if reason == "unreachable":
|
|
195
|
+
return {"tier": tier, "source": source, "verified": None,
|
|
196
|
+
"reason": "unreachable", "fingerprint": probe.get("fingerprint"),
|
|
197
|
+
"changed": False, "base": net._java_base(),
|
|
198
|
+
"note": "引擎不可达:未领取、未判定——网络问题不等于令牌问题"}
|
|
199
|
+
|
|
200
|
+
# 需要领:no-key / expired-anonymous / device-mismatch(以及过期但探针没给原文)
|
|
201
|
+
token = net._fetch_anon_token()
|
|
202
|
+
if not token:
|
|
203
|
+
hint = (";远程面若绑定非回环地址,代领默认关闭——请带 Authorization: Bearer <key>,"
|
|
204
|
+
"或服务端以 --allow-anon-mint 显式开启" if net.ANON_MINT_DISABLED else "")
|
|
205
|
+
raise net.ToolError(
|
|
206
|
+
"未配置接入 key 且匿名令牌端点不可用。引导:"
|
|
207
|
+
+ ";".join(str(g["label"]) for g in net._KEY_GUIDANCE) + hint, code=-32012)
|
|
208
|
+
rt._runtime_update({"java_key": token, "token_tier": "anonymous"})
|
|
209
|
+
probe2 = net.probe_key()
|
|
210
|
+
return {"tier": "anonymous", "source": "new-anonymous",
|
|
211
|
+
"verified": probe2.get("ok"), "reason": probe2.get("reason") or reason,
|
|
212
|
+
"fingerprint": probe2.get("fingerprint"), "changed": True,
|
|
213
|
+
"base": net._java_base()}
|
|
214
|
+
|
|
215
|
+
|
|
216
|
+
|
|
@@ -0,0 +1,208 @@
|
|
|
1
|
+
"""根定位:两个根 + 入口显式设置(D-structure-1 S3-A)。
|
|
2
|
+
|
|
3
|
+
历史(为什么改成两个根):此前用"`vod_mcp` 的父目录"一个算式兼容三种形态——仓内直跑、
|
|
4
|
+
载荷副本、插件副本。S3 把包迁进 `src/` 后这个算式失效:仓内形态下包根是 `<repo>/src`,
|
|
5
|
+
而分发态(install-manifest / build-info / 载荷)在 `<repo>`。一个根无法同时回答两件事。
|
|
6
|
+
|
|
7
|
+
现在的契约:
|
|
8
|
+
- **根由入口显式设置**(`bin/vod-devkit`、`npm/cli.js`、`server.main()`、`tests/conftest`、
|
|
9
|
+
`scripts/host_matrix.py` 各设 `VOD_DEVKIT_SRC_ROOT` / `VOD_DEVKIT_DIST_ROOT`);
|
|
10
|
+
入口不覆盖已存在的环境变量(测试注入/重定位要用它),但**继承值与入口所在仓不一致时
|
|
11
|
+
必然在 stderr 告警**——静默用错根的表现是"未知宿主 xxx(可选:)"这类无从解释的错;
|
|
12
|
+
- 本模块**只读不猜**;读不到时 derive-once 兜底(仅仓内开发/旧脚本),并告警;
|
|
13
|
+
- 两处都不可知 → 硬失败并提示应设哪个变量。
|
|
14
|
+
|
|
15
|
+
三种形态(实测口径,见 docs/architecture.md 7.1):
|
|
16
|
+
|
|
17
|
+
| 形态 | SRC_ROOT | DIST_ROOT | ASSETS |
|
|
18
|
+
|---|---|---|---|
|
|
19
|
+
| 仓内直跑 | `<repo>/src` | `<repo>` | `<repo>/assets` |
|
|
20
|
+
| 载荷副本 | 载荷根 | 载荷根 | 载荷根(平铺) |
|
|
21
|
+
| 插件副本 | 插件包根 | 插件包根 | 插件包根(平铺) |
|
|
22
|
+
|
|
23
|
+
旧布局(包直接挂在仓根,即 S3 之前的检出)在 0.6.x 保留一条回落:
|
|
24
|
+
`LEGACY_ALLOWED_UNTIL = "0.7.0"`,命中即 `DeprecationWarning`;到达该版本后直接硬失败
|
|
25
|
+
(`tests/test_p2_structure.py` 锁住"分支只存在于允许区间")。
|
|
26
|
+
"""
|
|
27
|
+
import json
|
|
28
|
+
import os
|
|
29
|
+
import warnings
|
|
30
|
+
from pathlib import Path
|
|
31
|
+
|
|
32
|
+
# 物理包位置:本文件在 <root>/vod_mcp/ 下(仓内=src/、载荷/插件副本=各自根)
|
|
33
|
+
_PKG_PARENT = Path(__file__).resolve().parent.parent
|
|
34
|
+
|
|
35
|
+
LEGACY_ALLOWED_UNTIL = "0.7.0"
|
|
36
|
+
_warned = False
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
def _warn(msg: str) -> None:
|
|
40
|
+
global _warned
|
|
41
|
+
if _warned:
|
|
42
|
+
return
|
|
43
|
+
_warned = True
|
|
44
|
+
warnings.warn(msg, DeprecationWarning, stacklevel=3)
|
|
45
|
+
|
|
46
|
+
|
|
47
|
+
def _version() -> str:
|
|
48
|
+
from vod_mcp import __version__
|
|
49
|
+
return __version__
|
|
50
|
+
|
|
51
|
+
|
|
52
|
+
def _v_tuple(v: str) -> tuple:
|
|
53
|
+
parts = []
|
|
54
|
+
for chunk in v.split(".")[:3]:
|
|
55
|
+
num = "".join(ch for ch in chunk if ch.isdigit())
|
|
56
|
+
parts.append(int(num or 0))
|
|
57
|
+
return tuple(parts + [0] * (3 - len(parts)))
|
|
58
|
+
|
|
59
|
+
|
|
60
|
+
def _looks_like_repo_dir(p: Path) -> bool:
|
|
61
|
+
return (p / "pyproject.toml").exists() or (p / "package.json").exists()
|
|
62
|
+
|
|
63
|
+
|
|
64
|
+
def _derive() -> tuple:
|
|
65
|
+
"""derive-once:无 env 时按物理位置推断,并在"非标准形态"上告警。
|
|
66
|
+
|
|
67
|
+
返回值 (src_root, dist_root, assets_root)。
|
|
68
|
+
"""
|
|
69
|
+
env_src = (os.environ.get("VOD_DEVKIT_SRC_ROOT") or "").strip()
|
|
70
|
+
env_dist = (os.environ.get("VOD_DEVKIT_DIST_ROOT") or "").strip()
|
|
71
|
+
|
|
72
|
+
if env_src or env_dist:
|
|
73
|
+
src = Path(env_src).expanduser().resolve() if env_src else _PKG_PARENT
|
|
74
|
+
dist = Path(env_dist).expanduser().resolve() if env_dist else _PKG_PARENT.parent
|
|
75
|
+
assets = dist / "assets" if (dist / "assets" / "skills").is_dir() else src
|
|
76
|
+
return (src, dist, assets)
|
|
77
|
+
|
|
78
|
+
repo = _PKG_PARENT.parent
|
|
79
|
+
if _PKG_PARENT.name == "src" and _looks_like_repo_dir(repo):
|
|
80
|
+
# ① 仓内直跑(S3 之后的检出):包在 src/,资产在 assets/
|
|
81
|
+
return (_PKG_PARENT, repo, repo / "assets")
|
|
82
|
+
|
|
83
|
+
if _PKG_PARENT.name != "src" and _looks_like_repo_dir(_PKG_PARENT):
|
|
84
|
+
# ② 旧布局(S3 之前的检出):包在仓根、资产也在仓根
|
|
85
|
+
if _v_tuple(_version()) >= _v_tuple(LEGACY_ALLOWED_UNTIL):
|
|
86
|
+
raise RuntimeError(
|
|
87
|
+
"检测到 S3 之前的旧仓内布局(vod_mcp/ 在仓根),该回落已在 "
|
|
88
|
+
f"{LEGACY_ALLOWED_UNTIL} 移除。请更新检出,或显式设置 "
|
|
89
|
+
"VOD_DEVKIT_SRC_ROOT / VOD_DEVKIT_DIST_ROOT。")
|
|
90
|
+
_warn("仓内旧布局已弃用(vod_mcp/ 在仓根):请使用 src/ 布局;"
|
|
91
|
+
f"{LEGACY_ALLOWED_UNTIL} 起将硬失败")
|
|
92
|
+
return (_PKG_PARENT, _PKG_PARENT, _PKG_PARENT)
|
|
93
|
+
|
|
94
|
+
# ③ 载荷 / 插件副本:包父目录就是分发根,代码与资产都平铺在它下面
|
|
95
|
+
root = _PKG_PARENT
|
|
96
|
+
return (root, root, root)
|
|
97
|
+
|
|
98
|
+
|
|
99
|
+
SRC_ROOT, DIST_ROOT, ASSETS = _derive()
|
|
100
|
+
|
|
101
|
+
# 兼容旧名:ROOT 是"分发态根"(manifest/build-info/载荷入口都相对它)
|
|
102
|
+
ROOT = DIST_ROOT
|
|
103
|
+
|
|
104
|
+
SKILLS = ASSETS / "skills"
|
|
105
|
+
CONTRACT = ASSETS / "contract" / "tools.schema.json"
|
|
106
|
+
POLICY = ASSETS / "safety" / "policy.json"
|
|
107
|
+
HOOKS = ASSETS / "hooks" # 载荷/插件副本里 hooks 平铺;仓内走 integrations
|
|
108
|
+
INSTALL_MANIFEST = DIST_ROOT / "install-manifest.json"
|
|
109
|
+
BUILD_INFO = DIST_ROOT / "build-info.json"
|
|
110
|
+
|
|
111
|
+
# ── 机器级运行期状态(D-token-machine-1,2026-11-16) ─────────────────────
|
|
112
|
+
#
|
|
113
|
+
# 为什么不在 DIST_ROOT 下:DIST_ROOT 装机形态是 ~/.vod-devkit/payloads/<版本>/,
|
|
114
|
+
# 一次升级就换目录 → 换 install_nonce → 重领匿名令牌(额度重计、账本断档)。
|
|
115
|
+
# 匿名令牌是**机器级身份**(设备锚点绑定),必须跨版本、跨宿主共享一份。
|
|
116
|
+
#
|
|
117
|
+
# 解析优先级(每次现读;D-state-read-1 的同一纪律):
|
|
118
|
+
# ① VOD_DEVKIT_HOME 显式(装机写进各宿主 env;测试写 tmp)
|
|
119
|
+
# ② 机器级 state 已存在 → 用它(存在即用,不依赖 env 透传)
|
|
120
|
+
# ③ 旧 DIST_ROOT/vod_mcp/runtime.json(首启兼容位,不是并行真源)
|
|
121
|
+
_STATE_DIRNAME = "state"
|
|
122
|
+
|
|
123
|
+
|
|
124
|
+
def machine_state_home() -> Path:
|
|
125
|
+
"""机器级状态目录(现读):VOD_DEVKIT_HOME > ~/.vod-devkit/state。"""
|
|
126
|
+
env = (os.environ.get("VOD_DEVKIT_HOME") or "").strip()
|
|
127
|
+
if env:
|
|
128
|
+
return Path(env).expanduser()
|
|
129
|
+
return Path(os.path.expanduser("~")) / ".vod-devkit" / _STATE_DIRNAME
|
|
130
|
+
|
|
131
|
+
|
|
132
|
+
def legacy_runtime_json() -> Path:
|
|
133
|
+
"""旧位置(版本目录内):只作兼容/迁移来源,不再作为日常真源。"""
|
|
134
|
+
return DIST_ROOT / "vod_mcp" / "runtime.json"
|
|
135
|
+
|
|
136
|
+
|
|
137
|
+
def runtime_json_path() -> Path:
|
|
138
|
+
"""当前生效的 runtime.json 路径(现读,长驻进程不冻结)。"""
|
|
139
|
+
env = (os.environ.get("VOD_DEVKIT_HOME") or "").strip()
|
|
140
|
+
if env:
|
|
141
|
+
return Path(env).expanduser() / "runtime.json"
|
|
142
|
+
machine = machine_state_home() / "runtime.json"
|
|
143
|
+
if machine.exists():
|
|
144
|
+
return machine
|
|
145
|
+
legacy = legacy_runtime_json()
|
|
146
|
+
return legacy if legacy.exists() else machine
|
|
147
|
+
|
|
148
|
+
|
|
149
|
+
def migrate_state_once() -> dict:
|
|
150
|
+
"""首启迁移:state 无 runtime 而旧位置有 → 复制一次(保留设备锚点与账本)。
|
|
151
|
+
|
|
152
|
+
为什么保留旧文件:迁移本身不该是破坏性操作;旧文件的删除留给
|
|
153
|
+
`uninstall --clean-global`(逐条打印)。
|
|
154
|
+
为什么要 `.migrated` 标记(2026-11-16 评审补强):只看"state 无 runtime"的话,
|
|
155
|
+
用户手工清掉 state 后旧文件会**复活**(下次启动又迁回来,令牌/账本被悄悄还原)。
|
|
156
|
+
有标记即视为"这台机器已经迁过",此后旧位置只读、不再回灌。
|
|
157
|
+
返回 {"migrated": bool, "from": str, "reason": str|None}。
|
|
158
|
+
"""
|
|
159
|
+
state = machine_state_home()
|
|
160
|
+
target = state / "runtime.json"
|
|
161
|
+
marker = state / ".migrated"
|
|
162
|
+
legacy = legacy_runtime_json()
|
|
163
|
+
if marker.exists():
|
|
164
|
+
return {"migrated": False, "from": None, "reason": "already-migrated"}
|
|
165
|
+
if target.exists() or not legacy.exists():
|
|
166
|
+
return {"migrated": False, "from": None, "reason": None}
|
|
167
|
+
try:
|
|
168
|
+
state.mkdir(parents=True, exist_ok=True)
|
|
169
|
+
target.write_bytes(legacy.read_bytes())
|
|
170
|
+
os.chmod(target, 0o600)
|
|
171
|
+
try:
|
|
172
|
+
os.chmod(state, 0o700)
|
|
173
|
+
except OSError:
|
|
174
|
+
pass
|
|
175
|
+
marker.write_text(json.dumps({"from": str(legacy), "migrated": True}) + "\n",
|
|
176
|
+
encoding="utf-8")
|
|
177
|
+
return {"migrated": True, "from": str(legacy), "reason": None}
|
|
178
|
+
except OSError:
|
|
179
|
+
return {"migrated": False, "from": None, "reason": "io-error"}
|
|
180
|
+
|
|
181
|
+
|
|
182
|
+
# 不提供模块级 RUNTIME_JSON 快照常量(D-token-machine-1 收口):它零消费方,
|
|
183
|
+
# 且违反本模块"路径类值不 import 期冻结"的纪律(D-state-read-1)——留着会被后人
|
|
184
|
+
# 当合法读法用。调用方一律 runtime_json_path() / runtime_state._runtime_path()。
|
|
185
|
+
|
|
186
|
+
|
|
187
|
+
def hook_script(name: str = "vod_router.py") -> Path:
|
|
188
|
+
"""宿主侧 hook 脚本的真实路径(默认预采集路由 vod_router.py;安全面 vod_guard.py)。
|
|
189
|
+
|
|
190
|
+
仓内:`integrations/hermes/hooks/<name>`(宿主侧资产,随载荷物化到 <payload>/hooks);
|
|
191
|
+
载荷/插件副本:`<root>/hooks/<name>`。
|
|
192
|
+
"""
|
|
193
|
+
repo_local = DIST_ROOT / "integrations" / "hermes" / "hooks" / name
|
|
194
|
+
if repo_local.is_file():
|
|
195
|
+
return repo_local
|
|
196
|
+
return HOOKS / name
|
|
197
|
+
|
|
198
|
+
|
|
199
|
+
def guard_script() -> Path:
|
|
200
|
+
"""读 Key 拦截 hook(pre_tool_call)的路径。"""
|
|
201
|
+
return hook_script("vod_guard.py")
|
|
202
|
+
|
|
203
|
+
|
|
204
|
+
def describe() -> dict:
|
|
205
|
+
"""诊断用:把"当前是哪两个根"打出来(doctor/explain 排障时不再靠猜)。"""
|
|
206
|
+
return {"srcRoot": str(SRC_ROOT), "distRoot": str(DIST_ROOT), "assets": str(ASSETS),
|
|
207
|
+
"stateHome": str(machine_state_home()),
|
|
208
|
+
"runtime": str(runtime_json_path())}
|
|
@@ -35,7 +35,7 @@ def payload_home() -> Path:
|
|
|
35
35
|
return Path(os.environ.get("VOD_PAYLOAD_HOME") or (Path.home() / ".vod-devkit"))
|
|
36
36
|
|
|
37
37
|
# 我们拥有的顶层条目(prune 只在这个集合内动手,绝不碰用户文件)
|
|
38
|
-
OWNED = ("vod_mcp", "contract", "safety", "skills", "
|
|
38
|
+
OWNED = ("vod_mcp", "contract", "safety", "skills", "hooks",
|
|
39
39
|
"build-info.json", "payload.json", "package.json")
|
|
40
40
|
|
|
41
41
|
SKIP_DIRS = {"__pycache__"}
|
|
@@ -101,12 +101,17 @@ def stage(version: str | None = None, quiet: bool = False) -> Path:
|
|
|
101
101
|
dest = payload_dir(version)
|
|
102
102
|
dest.mkdir(parents=True, exist_ok=True)
|
|
103
103
|
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
104
|
+
from vod_mcp import paths as _paths
|
|
105
|
+
# 运行期源码取自 SRC_ROOT(仓内=src/,载荷/插件副本=根),资产取自 ASSETS,
|
|
106
|
+
# hook 脚本取自它的真实位置(仓内在 integrations/hermes/hooks/)。
|
|
107
|
+
sources = {"vod_mcp": _paths.SRC_ROOT / "vod_mcp",
|
|
108
|
+
"contract": _paths.ASSETS / "contract",
|
|
109
|
+
"safety": _paths.ASSETS / "safety",
|
|
110
|
+
"skills": _paths.ASSETS / "skills",
|
|
111
|
+
"hooks": _paths.hook_script().parent}
|
|
107
112
|
for name, src in sources.items():
|
|
108
113
|
if not src.is_dir():
|
|
109
|
-
continue #
|
|
114
|
+
continue # hooks 可缺(历史版本载荷)
|
|
110
115
|
target = dest / name
|
|
111
116
|
target.mkdir(parents=True, exist_ok=True)
|
|
112
117
|
for f in _iter_files(src):
|
|
@@ -34,7 +34,7 @@ def info_payload(client_info: dict | None = None) -> dict:
|
|
|
34
34
|
return {
|
|
35
35
|
"version": bi.get("version"),
|
|
36
36
|
"commitSha": bi.get("commitSha"),
|
|
37
|
-
"packs": sorted(__import__("vod_mcp.packs", fromlist=["
|
|
37
|
+
"packs": sorted(__import__("vod_mcp.packs", fromlist=["effective_packs"]).effective_packs()),
|
|
38
38
|
"hostClient": host,
|
|
39
39
|
"manifestSummary": {
|
|
40
40
|
"target": mf.get("target"),
|
|
@@ -10,10 +10,10 @@
|
|
|
10
10
|
- initialize 的 instructions 换一版,明说远程面不给服务器本机路径(skillRoot
|
|
11
11
|
等价物),规则文本请走 vod_retrieve_skill。
|
|
12
12
|
|
|
13
|
-
|
|
14
|
-
-
|
|
15
|
-
|
|
16
|
-
|
|
13
|
+
收紧(2026-11-16 D-token-machine-1 修订):
|
|
14
|
+
- **身份优先取请求头**(Authorization: Bearer ***,逐请求、不进 env、不落盘)。
|
|
15
|
+
- 没有 Bearer 时与本地同链:领/复用**机器级匿名令牌**(同机独立部署的默认形态)。
|
|
16
|
+
多租户若需按调用方隔离,各调用方自带 Bearer;匿名档就是"整机一份"的低信任档。
|
|
17
17
|
|
|
18
18
|
插件不写库:本进程对 VOD 的全部动作仍然是调用引擎 HTTP API。
|
|
19
19
|
"""
|