vod-devkit 0.5.3 → 0.5.5
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 +17 -0
- package/README.md +12 -0
- package/bin/vod-devkit +60 -10
- package/contract/tools.schema.json +1 -1
- package/integrations/atomcode/host.json +5 -3
- package/integrations/codeartsdoer/host.json +1 -2
- package/package.json +3 -1
- package/plugins/vod-devkit/.codex-plugin/plugin.json +1 -1
- package/plugins/vod-devkit/build-info.json +3 -3
- package/plugins/vod-devkit/skills/vod-feedback-collect/SKILL.md +13 -4
- package/plugins/vod-devkit/skills/vod-problem-classification-rules/SKILL.md +2 -1
- package/plugins/vod-devkit/skills/vod-scoring-rules/SKILL.md +2 -1
- package/plugins/vod-devkit/vod_mcp/__init__.py +1 -1
- package/plugins/vod-devkit/vod_mcp/attribution.py +8 -8
- package/plugins/vod-devkit/vod_mcp/detect_framework.py +160 -0
- package/plugins/vod-devkit/vod_mcp/diagnose.py +102 -0
- package/plugins/vod-devkit/vod_mcp/host_adapters/codex.py +27 -5
- package/plugins/vod-devkit/vod_mcp/host_adapters/hermes.py +11 -5
- package/plugins/vod-devkit/vod_mcp/remote_app.py +25 -0
- package/plugins/vod-devkit/vod_mcp/skills_registry.py +6 -5
- package/plugins/vod-devkit/vod_mcp/tools.py +15 -17
- package/plugins/vod-devkit/vod_mcp/transport_remote.py +48 -0
- package/skills/vod-feedback-collect/SKILL.md +13 -4
- package/skills/vod-problem-classification-rules/SKILL.md +2 -1
- package/skills/vod-scoring-rules/SKILL.md +2 -1
- package/vod_mcp/__init__.py +1 -1
- package/vod_mcp/attribution.py +8 -8
- package/vod_mcp/detect_framework.py +160 -0
- package/vod_mcp/diagnose.py +102 -0
- package/vod_mcp/host_adapters/__pycache__/__init__.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/atomcode.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/base.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/codearts.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/codex.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/codex.py +27 -5
- package/vod_mcp/host_adapters/hermes.py +11 -5
- package/vod_mcp/remote_app.py +25 -0
- package/vod_mcp/skills_registry.py +6 -5
- package/vod_mcp/tools.py +15 -17
- package/vod_mcp/transport_remote.py +48 -0
|
@@ -0,0 +1,102 @@
|
|
|
1
|
+
"""诊断分层与错误解释(doctor 报告 + `explain` 子命令共用一张表)。
|
|
2
|
+
|
|
3
|
+
动机(对表 huaweicloud-devkit 的 doctor-report / explain-error):我们原来的
|
|
4
|
+
doctor 是一条条 FAIL 平铺打印,"哪里坏了"和"下一步做什么"全靠读文案猜;
|
|
5
|
+
运维在现场只会记住一句话——"doctor 报错了"。这里把**分类**和**动作**外置成数据:
|
|
6
|
+
|
|
7
|
+
- 每条检查/错误按关键词归到一个层(环境/载荷/配置/技能/网络/插件),
|
|
8
|
+
输出时按层分组,一眼看出是"机器环境问题"还是"我们自己的安装问题";
|
|
9
|
+
- 同一张表提供 explain():给错误码或错误片段,返回 层 / 原因 / 动作。
|
|
10
|
+
|
|
11
|
+
纪律:
|
|
12
|
+
- 表只描述"已知失败形态",不猜未知错误(未知就如实报"未收录"并给出排查入口)。
|
|
13
|
+
- 归层只按关键词匹配(确定性),不做语义推断——误归层会把运维带偏。
|
|
14
|
+
"""
|
|
15
|
+
import fnmatch
|
|
16
|
+
import re
|
|
17
|
+
|
|
18
|
+
LAYERS = ["环境", "载荷", "配置", "技能", "网络", "插件"]
|
|
19
|
+
|
|
20
|
+
# (关键词/正则, 层, 原因, 动作)
|
|
21
|
+
RULES = [
|
|
22
|
+
(r"无 install-manifest|未 install",
|
|
23
|
+
"环境", "还没装(或 manifest 被删)", "运行 install --target <宿主>"),
|
|
24
|
+
(r"commitSHA 不一致|commitSha",
|
|
25
|
+
"载荷", "安装记录与当前包不是同一份构建(升版后未重装)", "重跑 install"),
|
|
26
|
+
(r"载荷目录缺失|载荷被改动|载荷残留",
|
|
27
|
+
"载荷", "MCP 入口指向的副本不在/被改", "重跑 install 重建副本"),
|
|
28
|
+
(r"MCP 配置文件缺失|mcpConfig",
|
|
29
|
+
"配置", "宿主配置文件被删或挪了位置", "重跑 install --target <宿主>"),
|
|
30
|
+
(r"未列出 vod-devkit|mcp list",
|
|
31
|
+
"配置", "宿主没读到我们的 MCP 条目", "检查宿主配置文件里的 mcp 段后重装"),
|
|
32
|
+
(r"skills 目录缺失|技能文件缺失|技能文件漂移|技能原生副本缺失|技能拷贝件",
|
|
33
|
+
"技能", "技能副本缺失或与安装指纹不符", "重跑 install 恢复"),
|
|
34
|
+
(r"路由插件副本落后|vod-feedback-router",
|
|
35
|
+
"插件", "仓内话术已更新但装机副本是旧的", "重跑 install --target hermes"),
|
|
36
|
+
(r"AGENTS\.md 仍含旧一代注入|vod-submit-one-liner",
|
|
37
|
+
"插件", "旧注入教模型跳过征询(红线失效)", "重跑 install --target codex 自动清理"),
|
|
38
|
+
(r"远程面|远程 MCP|探活|不可达|401",
|
|
39
|
+
"网络", "远程端点不可达或工具面不符", "检查网络/端点版本;设 VOD_MCP_TOKEN 再验"),
|
|
40
|
+
(r"key 无效|401 拒绝|指纹",
|
|
41
|
+
"网络", "引擎拒绝了 key", "核对/续期 key,或移除 key 走匿名档"),
|
|
42
|
+
(r"引擎不可达|ProbeError|timed out|Connection",
|
|
43
|
+
"网络", "引擎/网络不可达(不是 key 问题)", "查网络出口与引擎健康;离线可继续工作"),
|
|
44
|
+
(r"-32010|产品", "配置", "缺产品归属,拒绝提交", "先问用户是哪个产品,再带 product 提交"),
|
|
45
|
+
(r"python|node|版本", "环境", "运行时版本不满足", "按 README 的版本要求升级"),
|
|
46
|
+
]
|
|
47
|
+
|
|
48
|
+
_EXPLAIN_EXTRA = {
|
|
49
|
+
"-32010": ("配置",
|
|
50
|
+
"缺少产品归属(用户没说、也追问不到),服务端拒绝写引擎",
|
|
51
|
+
"先用 vod_search_products 给候选问用户;用户说不清楚就不提交"),
|
|
52
|
+
"-32011": ("配置", "产品不在名录里", "按名录候选再确认一次;仍对不上则不提交"),
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
|
|
56
|
+
def classify(message: str) -> tuple:
|
|
57
|
+
"""把一条失败/警告文案归到 (层, 原因, 动作)。未收录 → ("未分类", "", "")。"""
|
|
58
|
+
for pat, layer, cause, action in RULES:
|
|
59
|
+
if re.search(pat, message):
|
|
60
|
+
return layer, cause, action
|
|
61
|
+
return "未分类", "", ""
|
|
62
|
+
|
|
63
|
+
|
|
64
|
+
def explain(text: str) -> dict:
|
|
65
|
+
"""给错误码或错误片段,返回 {layer, cause, action, known}。"""
|
|
66
|
+
for code, (layer, cause, action) in _EXPLAIN_EXTRA.items():
|
|
67
|
+
if code in text:
|
|
68
|
+
return {"layer": layer, "cause": cause, "action": action, "known": True}
|
|
69
|
+
layer, cause, action = classify(text)
|
|
70
|
+
return {"layer": layer, "cause": cause, "action": action,
|
|
71
|
+
"known": layer != "未分类"}
|
|
72
|
+
|
|
73
|
+
|
|
74
|
+
def group(problems: list) -> dict:
|
|
75
|
+
"""按层分组(保持 LAYERS 顺序,未分类排最后)。"""
|
|
76
|
+
buckets = {l: [] for l in LAYERS}
|
|
77
|
+
buckets["未分类"] = []
|
|
78
|
+
for msg in problems:
|
|
79
|
+
layer, cause, action = classify(msg)
|
|
80
|
+
buckets[layer].append((msg, cause, action))
|
|
81
|
+
return {k: v for k, v in buckets.items() if v}
|
|
82
|
+
|
|
83
|
+
|
|
84
|
+
def render_problems(problems: list) -> str:
|
|
85
|
+
"""把失败清单渲染成分层报告(供 doctor 输出)。"""
|
|
86
|
+
if not problems:
|
|
87
|
+
return ""
|
|
88
|
+
out = []
|
|
89
|
+
for layer, items in group(problems).items():
|
|
90
|
+
out.append(f"[{layer}]")
|
|
91
|
+
for msg, cause, action in items:
|
|
92
|
+
out.append(f"FAIL: {msg}")
|
|
93
|
+
if cause:
|
|
94
|
+
out.append(f" 原因:{cause}")
|
|
95
|
+
if action:
|
|
96
|
+
out.append(f" 动作:{action}")
|
|
97
|
+
return "\n".join(out)
|
|
98
|
+
|
|
99
|
+
|
|
100
|
+
def matches(message: str, pattern: str) -> bool:
|
|
101
|
+
"""给运维手输片段做粗匹配(大小写不敏感,支持 * 通配)。"""
|
|
102
|
+
return fnmatch.fnmatch(message.lower(), pattern.lower())
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -6,7 +6,7 @@ import sys
|
|
|
6
6
|
from pathlib import Path
|
|
7
7
|
|
|
8
8
|
from vod_mcp import hosts as host_specs
|
|
9
|
-
from vod_mcp.host_adapters.base import ROOT
|
|
9
|
+
from vod_mcp.host_adapters.base import ROOT, server_env, server_entry
|
|
10
10
|
|
|
11
11
|
HOST = "codex"
|
|
12
12
|
SUPPORTS_REMOTE = True
|
|
@@ -16,11 +16,24 @@ _AGENTS_MARKER_BEGIN = "<!-- vod-devkit:feedback-skill BEGIN -->"
|
|
|
16
16
|
# 且 1705 个历史会话带着它跑(实测)。清理逻辑必须认这个标记,否则残留继续生效。
|
|
17
17
|
_LEGACY_ONE_LINER = "<!-- vod-submit-one-liner -->"
|
|
18
18
|
_AGENTS_MARKER_END = "<!-- vod-devkit:feedback-skill END -->"
|
|
19
|
-
_SPEC =
|
|
19
|
+
_SPEC: dict | None = None
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
def _spec() -> dict:
|
|
23
|
+
"""调用期解析宿主配置(模块 import 期读 integrations/ 会在载荷副本里炸)。
|
|
24
|
+
|
|
25
|
+
2026-11-12 实锤:载荷副本不含 integrations/,import 期 host_specs.load("codex")
|
|
26
|
+
直接 KeyError → 远程面每个请求 500。宿主配置只在 install 期用得上,运行期
|
|
27
|
+
server 不需要它。
|
|
28
|
+
"""
|
|
29
|
+
global _SPEC
|
|
30
|
+
if _SPEC is None:
|
|
31
|
+
_SPEC = host_specs.load("codex")
|
|
32
|
+
return _SPEC
|
|
20
33
|
|
|
21
34
|
|
|
22
35
|
def skills_dir(args):
|
|
23
|
-
d =
|
|
36
|
+
d = _spec().get("skillsDir")
|
|
24
37
|
return Path(d) if d else None
|
|
25
38
|
|
|
26
39
|
|
|
@@ -98,7 +111,7 @@ def install(args, packs: str) -> Path:
|
|
|
98
111
|
if not codex:
|
|
99
112
|
print("[vod-devkit] 未找到 codex CLI,无法走原生插件安装", file=sys.stderr)
|
|
100
113
|
sys.exit(2)
|
|
101
|
-
spec =
|
|
114
|
+
spec = _spec()
|
|
102
115
|
conf = Path(spec["configPath"])
|
|
103
116
|
if conf.exists(): # 历史遗留:config.toml MCP 段与插件同名=双注册,移除
|
|
104
117
|
text = conf.read_text(encoding="utf-8")
|
|
@@ -170,7 +183,16 @@ def install(args, packs: str) -> Path:
|
|
|
170
183
|
mj = json.loads(Path(mcp_jsons[0]).read_text(encoding="utf-8"))
|
|
171
184
|
srv = mj.get("mcpServers", {}).get("vod-devkit")
|
|
172
185
|
if srv is not None:
|
|
173
|
-
|
|
186
|
+
# 关键修正(2026-11-12 矩阵实锤):插件自带的 .mcp.json 写的是
|
|
187
|
+
# command="vod-devkit" + args=["serve"] —— 依赖 PATH 上那个全局包。
|
|
188
|
+
# 机器上装着旧版(实测 0.4.2)时,codex 会静默跑旧副本:配置、
|
|
189
|
+
# 技能都是新的,工具面却是旧的。改成绝对解释器 + 载荷副本,与其它
|
|
190
|
+
# 宿主同一条铁律(入口不依赖 PATH / npx 缓存)。
|
|
191
|
+
srv["command"] = sys.executable
|
|
192
|
+
srv["args"] = [server_entry()]
|
|
193
|
+
merged = dict(srv.get("env") or {})
|
|
194
|
+
merged.update(server_env(args, packs))
|
|
195
|
+
srv["env"] = merged
|
|
174
196
|
Path(mcp_jsons[0]).write_text(
|
|
175
197
|
json.dumps(mj, ensure_ascii=False, indent=2) + "\n",
|
|
176
198
|
encoding="utf-8")
|
|
@@ -14,12 +14,18 @@ from vod_mcp.host_adapters.base import ROOT, server_env, server_entry
|
|
|
14
14
|
|
|
15
15
|
HOST = "hermes"
|
|
16
16
|
SUPPORTS_REMOTE = True
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
def _spec() -> dict:
|
|
18
|
+
"""调用期现读:host.json 的 ~ 必须在调用期按当前 HOME 解析。
|
|
19
|
+
|
|
20
|
+
2026-11-12 实锤:模块 import 期求值 _MCP_DIR 后,测试里 monkeypatch HOME
|
|
21
|
+
写不到隔离目录,直接把真实 ~/.hermes/mcp/vod-devkit.json 覆盖成了桩值
|
|
22
|
+
(command=/x/vod_mcp/server.py)——真机 doctor 当场读到坏条目。
|
|
23
|
+
"""
|
|
24
|
+
return host_specs.load("hermes")
|
|
19
25
|
|
|
20
26
|
|
|
21
27
|
def skills_dir(args):
|
|
22
|
-
return Path(
|
|
28
|
+
return Path(_spec()["skillsDir"])
|
|
23
29
|
|
|
24
30
|
|
|
25
31
|
PLUGIN_NAME = "vod-feedback-router"
|
|
@@ -67,7 +73,7 @@ def enable_plugin(name: str = PLUGIN_NAME) -> str:
|
|
|
67
73
|
|
|
68
74
|
def install(args, packs: str) -> Path:
|
|
69
75
|
"""Hermes:官方途径 hermes mcp add(config.yaml mcp_servers)。"""
|
|
70
|
-
conf =
|
|
76
|
+
conf = Path(_spec()["configPath"]).parent / "vod-devkit.json"
|
|
71
77
|
conf.parent.mkdir(parents=True, exist_ok=True)
|
|
72
78
|
conf.write_text(json.dumps({
|
|
73
79
|
"name": "vod-devkit", "command": sys.executable,
|
|
@@ -112,7 +118,7 @@ def install_remote(args, url, token):
|
|
|
112
118
|
print(f"[vod-devkit] hermes mcp add(remote)失败:{(r.stderr or r.stdout).strip()[-200:]}",
|
|
113
119
|
file=sys.stderr)
|
|
114
120
|
sys.exit(1)
|
|
115
|
-
conf =
|
|
121
|
+
conf = Path(_spec()["configPath"]).parent / "vod-devkit.json"
|
|
116
122
|
conf.parent.mkdir(parents=True, exist_ok=True)
|
|
117
123
|
conf.write_text(json.dumps({"name": "vod-devkit", "url": url,
|
|
118
124
|
"headers": {"Authorization": "Bearer ${MCP_VOD_DEVKIT_API_KEY}"}},
|
package/vod_mcp/remote_app.py
CHANGED
|
@@ -58,7 +58,32 @@ class _RemoteServer(Server):
|
|
|
58
58
|
return super().create_initialization_options(*args, **kwargs)
|
|
59
59
|
|
|
60
60
|
|
|
61
|
+
def verify_servable_skills() -> None:
|
|
62
|
+
"""远程面构造期自校验(对齐 devkit 的 verifySkillTree)。
|
|
63
|
+
|
|
64
|
+
动机:list_skills 是注册表驱动的——如果技能文件缺失/被删,工具仍会宣传一堆
|
|
65
|
+
retrieve_skill 取不到的名字,调用方只能反复失败。远程面是无鉴权的长驻服务,
|
|
66
|
+
这种"宣传了但给不出"的状态必须在构造期就拒绝,而不是每个用户踩一次。
|
|
67
|
+
"""
|
|
68
|
+
from vod_mcp import skills_registry as sr
|
|
69
|
+
if not sr.SKILLS_ROOT.is_dir():
|
|
70
|
+
raise RuntimeError(
|
|
71
|
+
f"远程面拒绝启动/构造:技能树不存在 {sr.SKILLS_ROOT}"
|
|
72
|
+
"——list_skills/retrieve_skill 会整体失效(重跑 install 重建载荷)")
|
|
73
|
+
dirs = sr._skill_dirs()
|
|
74
|
+
if not dirs:
|
|
75
|
+
raise RuntimeError(
|
|
76
|
+
f"远程面拒绝启动/构造:{sr.SKILLS_ROOT} 下没有任何目录型技能(缺 SKILL.md)"
|
|
77
|
+
"——远程面不许在没有规则文本的情况下对外服务")
|
|
78
|
+
broken = [d.name for d in dirs if not (d / "SKILL.md").is_file()]
|
|
79
|
+
if broken:
|
|
80
|
+
raise RuntimeError("远程面拒绝启动/构造:技能文件缺失 "
|
|
81
|
+
+ "、".join(sorted(broken)) + "(重跑 install 重建载荷)")
|
|
82
|
+
|
|
83
|
+
|
|
61
84
|
def build_server(remote: bool = True) -> Server:
|
|
85
|
+
if remote:
|
|
86
|
+
verify_servable_skills()
|
|
62
87
|
version = tools.load_contract()["version"]
|
|
63
88
|
|
|
64
89
|
async def on_list_tools(ctx, params):
|
|
@@ -6,11 +6,12 @@
|
|
|
6
6
|
**server data**:任何 MCP 宿主(包括没有原生技能目录的宿主,如 dsh headless)
|
|
7
7
|
都能按需取到与包内完全一致的规则全文,且改规则不必碰四份宿主拷贝。
|
|
8
8
|
|
|
9
|
-
分工(与 devkit
|
|
10
|
-
- 元技能(vod-core / vod-feedback-collect
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
9
|
+
分工(与 devkit 一致,2026-11-12 复评校准):
|
|
10
|
+
- 元技能(vod-core / vod-feedback-collect)由安装器随对应 pack 拷进宿主技能目录;
|
|
11
|
+
- 领域规则技能**双轨**:安装器无条件落地静态副本(采集侧偶尔要答"为什么归这类"),
|
|
12
|
+
本模块另提供同文本的按需取全文——给没有技能目录的宿主(generic/headless)兜底,
|
|
13
|
+
也保证改规则时不必依赖四份宿主拷贝同步。knowledge pack 控制的是**披露工具**
|
|
14
|
+
(vod_list_skills / vod_retrieve_skill),裁剪时拒绝并给指引,不是文件可见性。
|
|
14
15
|
"""
|
|
15
16
|
import re
|
|
16
17
|
from pathlib import Path
|
package/vod_mcp/tools.py
CHANGED
|
@@ -89,13 +89,17 @@ JAVA_KEY = os.environ.get("VOD_JAVA_API_KEY", "") or _RT.get("java_key", "") #
|
|
|
89
89
|
_META_PATH = "/rest/developer/manager/hdvodmngservice/v1/external/meta"
|
|
90
90
|
_META_TTL = 24 * 3600
|
|
91
91
|
# 快照兜底(引擎 meta 端点未上线/不可达时用;stale 语义见 _load_meta)
|
|
92
|
-
|
|
93
|
-
|
|
92
|
+
# **不预置任何产品名/短码**(2026-11-13 负责人纪律):支持的产品列表唯一真源=
|
|
93
|
+
# 引擎 meta 接口(productCatalog/products),插件自带的清单会随运营变更过期,
|
|
94
|
+
# 而过期清单最危险的用法正是静默归因。名录不可达 → products=[]、归因一律
|
|
95
|
+
# UNKNOWN→追问,只保留 stale 标记(引导文案据此提示"名录暂不可用")。
|
|
96
|
+
_META_SNAPSHOT: dict = {"products": []}
|
|
94
97
|
|
|
95
98
|
|
|
96
99
|
def _load_meta(force: bool = False) -> dict:
|
|
97
100
|
"""可漂移值动态取:缓存 TTL 24h,引擎端点不可达时回退快照并标 stale。
|
|
98
|
-
真源=引擎
|
|
101
|
+
真源=引擎 meta 接口(productCatalog/products)——**本模块不维护任何产品
|
|
102
|
+
清单**,离线时宁可不归因也不拿本地表猜。
|
|
99
103
|
|
|
100
104
|
T7i:productCatalog=[{id,name}](t_vod_product 运营预置,meta 组装)——
|
|
101
105
|
提交产品归因按平台主键 id 的解析真源;老引擎无该键=catalog 空。
|
|
@@ -241,15 +245,9 @@ def _memory_put(client_info, **fields) -> None:
|
|
|
241
245
|
_SESSION_MEM[key] = cur
|
|
242
246
|
|
|
243
247
|
|
|
244
|
-
def _host_product() -> str | None:
|
|
245
|
-
"""宿主产品(兜底用):安装期写入 runtime.host_product,env 可覆盖。"""
|
|
246
|
-
return (os.environ.get("VOD_HOST_PRODUCT")
|
|
247
|
-
or str(_RT.get("host_product") or "").strip()
|
|
248
|
-
or str(_runtime_cfg().get("host_product") or "").strip() or None)
|
|
249
|
-
|
|
250
|
-
|
|
251
248
|
def search_products(params: dict) -> dict:
|
|
252
|
-
"""产品候选检索(只读):给模型 3-5
|
|
249
|
+
"""产品候选检索(只读):给模型 3-5 个候选去问用户,而不是从名录里瞎猜。
|
|
250
|
+
名录=引擎 meta 接口的 productCatalog(长度随运营变更,插件不内置)。"""
|
|
253
251
|
query = str(params.get("query") or "").strip()
|
|
254
252
|
limit = int(params.get("limit") or 5)
|
|
255
253
|
limit = max(1, min(limit, 20))
|
|
@@ -291,8 +289,10 @@ def _attribute_product(items: list, params: dict, client_info: dict | None = Non
|
|
|
291
289
|
② 原话唯一且高置信提及(多产品/歧义=低置信,转去问)
|
|
292
290
|
③ 会话记忆(30 分钟滑动,进程内;跨会话不继承)
|
|
293
291
|
④ 安装先验
|
|
294
|
-
|
|
295
|
-
|
|
292
|
+
四级都拿不到(含用户明确说"不知道/随便"= params.productNotSpecified)→
|
|
293
|
+
返回 source=unknown + confidence=low,由调用方抛可执行错误要求追问。
|
|
294
|
+
**不做 host_default 兜底**(2026-11-12 复评删除:宿主产品也是一次推断,
|
|
295
|
+
错归的产品会进引擎幂等/判重域,污染静默且难追溯)。
|
|
296
296
|
"""
|
|
297
297
|
text = "\n".join(content for _i, _v, content in items)
|
|
298
298
|
meta = _load_meta()
|
|
@@ -344,11 +344,9 @@ def _attribute_product(items: list, params: dict, client_info: dict | None = Non
|
|
|
344
344
|
result["confidence"] = "medium"
|
|
345
345
|
return result
|
|
346
346
|
|
|
347
|
+
# 用户明确说"不知道/随便":同样是"不猜、不提交"——只影响回执原因字段
|
|
348
|
+
# (productNotSpecified=true),不做任何兜底推断。
|
|
347
349
|
not_specified = bool(params.get("productNotSpecified")) or bool(mem.get("not_specified"))
|
|
348
|
-
if not_specified:
|
|
349
|
-
# 用户明确说不知道:**不做任何猜测**(不按宿主产品兜底——那也是一次推断,
|
|
350
|
-
# 且产品会进引擎幂等域,错归代价比丢一条高)。交给调用方提示用户"缺产品不提交"。
|
|
351
|
-
pass
|
|
352
350
|
ev = list(result.get("evidence") or [])
|
|
353
351
|
if not_specified:
|
|
354
352
|
ev = [{"reason": "user-not-specified"}] + ev
|
|
@@ -21,6 +21,7 @@ devkit 的契约(mcp-server-remote.ts + test/remote-mcp-server.test.ts 实测
|
|
|
21
21
|
"""
|
|
22
22
|
import asyncio
|
|
23
23
|
import json
|
|
24
|
+
import os
|
|
24
25
|
import sys
|
|
25
26
|
import threading
|
|
26
27
|
from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
|
|
@@ -30,6 +31,44 @@ DEFAULT_PORT = 9528
|
|
|
30
31
|
MAX_BODY = 4 * 1024 * 1024
|
|
31
32
|
LOOPBACK = ("127.0.0.1", "localhost", "::1")
|
|
32
33
|
|
|
34
|
+
# 载荷自校验缓存:远程面是长驻无鉴权服务,被改过的服务端载荷要当场拒绝服务,
|
|
35
|
+
# 不能等运维跑 doctor 才发现(devkit 的每请求 verifySkillTree 同思路)。
|
|
36
|
+
# TTL 缓存避免每个请求都做一遍 sha256 全集(40+ 文件)。
|
|
37
|
+
_PAYLOAD_GUARD = {"at": 0.0, "sig": None, "problems": []}
|
|
38
|
+
_PAYLOAD_GUARD_TTL = 30.0
|
|
39
|
+
|
|
40
|
+
|
|
41
|
+
def payload_problems(force: bool = False) -> list:
|
|
42
|
+
"""远程面载荷完整性检查(载荷目录不存在/被改 → 非空列表)。
|
|
43
|
+
|
|
44
|
+
只校验"载荷副本"形态:stdio/仓内直跑没有 payload.json,返回空(不误伤)。
|
|
45
|
+
"""
|
|
46
|
+
import time as _t
|
|
47
|
+
from pathlib import Path
|
|
48
|
+
from vod_mcp import payload as _pl
|
|
49
|
+
_P = Path
|
|
50
|
+
# 显式 env 优先(安装期注入),否则按自身所在树推断——*不许* import
|
|
51
|
+
# host_adapters:它的 __init__ 会连带 import 各宿主适配模块,而载荷副本不含
|
|
52
|
+
# integrations/(2026-11-12 实锤:请求线程 KeyError → 每个请求 500)。
|
|
53
|
+
env_dir = (os.environ.get("VOD_PAYLOAD_DIR") or "").strip()
|
|
54
|
+
d = _P(env_dir) if env_dir else None
|
|
55
|
+
if d is None:
|
|
56
|
+
# 从载荷副本直接起来的服务(entry = <payload>/vod_mcp/server.py)没有
|
|
57
|
+
# install 期注入的 payload_dir —— 用自身所在树推断:载荷根里有 payload.json
|
|
58
|
+
# 就说明"我就是那份副本",必须自校验(否则被改的副本会一直对外服务)。
|
|
59
|
+
root = _P(__file__).resolve().parent.parent
|
|
60
|
+
d = root if (root / "payload.json").exists() else None
|
|
61
|
+
if d is None:
|
|
62
|
+
return []
|
|
63
|
+
meta = _P(d) / "payload.json"
|
|
64
|
+
sig = (str(meta), meta.stat().st_mtime if meta.exists() else 0.0)
|
|
65
|
+
now = _t.time()
|
|
66
|
+
if not force and _PAYLOAD_GUARD["sig"] == sig and now - _PAYLOAD_GUARD["at"] < _PAYLOAD_GUARD_TTL:
|
|
67
|
+
return list(_PAYLOAD_GUARD["problems"])
|
|
68
|
+
problems = _pl.verify(_P(d))
|
|
69
|
+
_PAYLOAD_GUARD.update({"at": now, "sig": sig, "problems": list(problems)})
|
|
70
|
+
return problems
|
|
71
|
+
|
|
33
72
|
|
|
34
73
|
class RemoteRuntime:
|
|
35
74
|
"""持有 asyncio 事件循环 + SDK session manager 的生命周期。"""
|
|
@@ -250,6 +289,15 @@ class _Handler(BaseHTTPRequestHandler):
|
|
|
250
289
|
if isinstance(message, dict) and "id" not in message:
|
|
251
290
|
self._empty(202)
|
|
252
291
|
return
|
|
292
|
+
# 服务端载荷自校验:被改/缺文件的载荷不许继续对外服务
|
|
293
|
+
problems = payload_problems()
|
|
294
|
+
if problems:
|
|
295
|
+
self._json(503, {"jsonrpc": "2.0", "id": message.get("id") if isinstance(message, dict) else None,
|
|
296
|
+
"error": {"code": -32603,
|
|
297
|
+
"message": "服务端载荷校验未通过(拒绝服务):"
|
|
298
|
+
+ ";".join(problems[:5])}})
|
|
299
|
+
return
|
|
300
|
+
|
|
253
301
|
raw_auth = (self.headers.get("Authorization") or "").strip()
|
|
254
302
|
key = raw_auth[7:].strip() if raw_auth.lower().startswith("bearer ") else ""
|
|
255
303
|
|