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,38 +1,208 @@
|
|
|
1
|
-
"""
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
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` 锁住"分支只存在于允许区间")。
|
|
18
26
|
"""
|
|
27
|
+
import json
|
|
19
28
|
import os
|
|
29
|
+
import warnings
|
|
20
30
|
from pathlib import Path
|
|
21
31
|
|
|
22
|
-
#
|
|
23
|
-
|
|
24
|
-
|
|
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
|
|
25
197
|
|
|
26
198
|
|
|
27
|
-
def
|
|
28
|
-
"""
|
|
29
|
-
|
|
30
|
-
return Path(env).expanduser().resolve() if env else DEFAULT_ROOT
|
|
199
|
+
def guard_script() -> Path:
|
|
200
|
+
"""读 Key 拦截 hook(pre_tool_call)的路径。"""
|
|
201
|
+
return hook_script("vod_guard.py")
|
|
31
202
|
|
|
32
203
|
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
RUNTIME_JSON = ROOT / "vod_mcp" / "runtime.json"
|
|
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
|
"""
|
|
@@ -5,10 +5,14 @@
|
|
|
5
5
|
本模块只依赖 paths 与 stdlib;需要身份(net._eff_key)时**函数内懒导入**,避免
|
|
6
6
|
net ↔ runtime_state 的循环。
|
|
7
7
|
"""
|
|
8
|
+
import datetime
|
|
8
9
|
import json
|
|
9
10
|
import os
|
|
11
|
+
import shutil
|
|
10
12
|
import stat
|
|
13
|
+
import sys
|
|
11
14
|
import threading
|
|
15
|
+
from contextlib import contextmanager
|
|
12
16
|
from pathlib import Path
|
|
13
17
|
|
|
14
18
|
from vod_mcp import attribution as _attrib
|
|
@@ -19,7 +23,9 @@ _RT_LOCK = threading.RLock()
|
|
|
19
23
|
|
|
20
24
|
|
|
21
25
|
def _runtime_path() -> Path:
|
|
22
|
-
|
|
26
|
+
# D-token-machine-1:机器级 state(跨版本/跨宿主一份);每次现读,
|
|
27
|
+
# 长驻进程不冻结(D-state-read-1 的同一条纪律:常量会把"换了 key/搬了目录"冻住)
|
|
28
|
+
return paths.runtime_json_path()
|
|
23
29
|
|
|
24
30
|
|
|
25
31
|
def _runtime_cfg() -> dict:
|
|
@@ -38,37 +44,110 @@ _RT = _runtime_cfg()
|
|
|
38
44
|
|
|
39
45
|
|
|
40
46
|
def _runtime_update(update: dict, replace: bool = False) -> None:
|
|
41
|
-
"""
|
|
47
|
+
"""更新运行期状态:落盘(事务内)→ 内存镜像。
|
|
42
48
|
|
|
49
|
+
落盘的锁由 `_runtime_atomic` 持(嵌套持锁会让 flock 在同一文件上二次加锁而
|
|
50
|
+
死锁——同一进程两个 fd 互斥);镜像只服务本进程,用 _RT_LOCK 单独保护。
|
|
43
51
|
replace=False 时按单参调用 _save_runtime:测试桩普遍是 `lambda u: ...`
|
|
44
52
|
(历史签名),多传一个默认值会把所有桩打红——签名兼容性属于接口契约。
|
|
45
53
|
"""
|
|
54
|
+
if replace:
|
|
55
|
+
_save_runtime(update, replace=True)
|
|
56
|
+
else:
|
|
57
|
+
_save_runtime(update)
|
|
46
58
|
with _RT_LOCK:
|
|
47
|
-
if replace:
|
|
48
|
-
_save_runtime(update, replace=True)
|
|
49
|
-
else:
|
|
50
|
-
_save_runtime(update)
|
|
51
59
|
if replace:
|
|
52
60
|
_RT.clear()
|
|
53
61
|
_RT.update(update)
|
|
54
62
|
|
|
55
63
|
|
|
56
|
-
def
|
|
57
|
-
"""
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
64
|
+
def _lock_path() -> Path:
|
|
65
|
+
"""跨进程锁文件(与 runtime.json 同目录、同名前缀,便于 --clean-global 认出来)。"""
|
|
66
|
+
p = _runtime_path()
|
|
67
|
+
return p.with_name(p.name + ".lock")
|
|
68
|
+
|
|
69
|
+
|
|
70
|
+
@contextmanager
|
|
71
|
+
def _file_lock():
|
|
72
|
+
"""跨进程互斥:同一份载荷 runtime.json 被同一台机器上多个宿主的 server 进程共用。
|
|
73
|
+
|
|
74
|
+
`_RT_LOCK` 只保护**进程内**;多进程同时"读→改→写"会互相覆盖(实测:4 进程各写
|
|
75
|
+
25 次,落盘只剩 36 条;`pending.py` 那条低价值补交队列反而是原子的)。
|
|
76
|
+
POSIX 用 `fcntl.flock`;没有 fcntl 的平台退化为空上下文——那里没有对等的成熟机制,
|
|
77
|
+
硬造一个只会引入新故障,README 按"仅 POSIX 覆盖"标注。
|
|
78
|
+
"""
|
|
79
|
+
try:
|
|
80
|
+
import fcntl
|
|
81
|
+
except ImportError: # pragma: no cover - Windows
|
|
82
|
+
yield
|
|
83
|
+
return
|
|
84
|
+
p = _lock_path()
|
|
85
|
+
try:
|
|
86
|
+
p.parent.mkdir(parents=True, exist_ok=True)
|
|
87
|
+
f = open(p, "a+", encoding="utf-8")
|
|
88
|
+
except OSError: # 锁不可用不该让写入失败(宁可有竞态也不要写不进)
|
|
89
|
+
yield
|
|
90
|
+
return
|
|
91
|
+
try:
|
|
92
|
+
fcntl.flock(f.fileno(), fcntl.LOCK_EX)
|
|
93
|
+
yield
|
|
94
|
+
finally:
|
|
95
|
+
try:
|
|
96
|
+
fcntl.flock(f.fileno(), fcntl.LOCK_UN)
|
|
97
|
+
finally:
|
|
98
|
+
f.close()
|
|
99
|
+
|
|
100
|
+
|
|
101
|
+
def _quarantine_bad_runtime(p: Path, err: Exception) -> Path | None:
|
|
102
|
+
"""坏文件**先备份再继续**,绝不静默丢弃。
|
|
103
|
+
|
|
104
|
+
为什么不选"拒绝覆盖":那会让插件在坏文件之后完全不能提交/记账(用户看到的是
|
|
105
|
+
"插件坏了"),而备份已经保住可恢复性。备份名带时间戳,告警里给绝对路径。
|
|
106
|
+
"""
|
|
107
|
+
ts = datetime.datetime.now().strftime("%Y%m%d-%H%M%S")
|
|
108
|
+
dst = p.with_name(f"{p.name}.corrupt-{ts}")
|
|
109
|
+
try:
|
|
110
|
+
shutil.copy2(p, dst)
|
|
111
|
+
except OSError as e:
|
|
112
|
+
msg = f"runtime.json 解析失败({err})且备份失败({e})——本次以空状态继续"
|
|
113
|
+
_warn(msg)
|
|
114
|
+
print(f"[vod-devkit] warn: {msg}", file=sys.stderr)
|
|
115
|
+
return None
|
|
116
|
+
msg = (f"runtime.json 解析失败({err}):原文件已备份到 {dst},"
|
|
117
|
+
"本次以空状态继续(可人工核对/恢复)")
|
|
118
|
+
_warn(msg)
|
|
119
|
+
# 这份文件里有 key 与账本:宿主必须当场看到(stdio 面的 stderr 会透给用户),
|
|
120
|
+
# 只写 /tmp 日志等于没有告警。
|
|
121
|
+
print(f"[vod-devkit] warn: {msg}", file=sys.stderr)
|
|
122
|
+
return dst
|
|
123
|
+
|
|
124
|
+
|
|
125
|
+
def _read_cfg_unlocked(p: Path) -> dict:
|
|
126
|
+
"""锁内读(调用方已持 _RT_LOCK + 文件锁)。坏文件先备份再继续。"""
|
|
127
|
+
if not p.exists():
|
|
128
|
+
return {}
|
|
129
|
+
try:
|
|
130
|
+
return json.loads(p.read_text(encoding="utf-8"))
|
|
131
|
+
except Exception as e: # noqa: BLE001 坏文件:备份后继续
|
|
132
|
+
_quarantine_bad_runtime(p, e)
|
|
133
|
+
return {}
|
|
134
|
+
|
|
135
|
+
|
|
136
|
+
def _write_cfg_unlocked(p: Path, cfg: dict) -> None:
|
|
137
|
+
"""锁内原子写:tmp → chmod 0600 → os.replace。"""
|
|
138
|
+
tmp = p.with_name(p.name + ".tmp")
|
|
139
|
+
tmp.write_text(json.dumps(cfg, ensure_ascii=False, indent=2), encoding="utf-8")
|
|
140
|
+
try:
|
|
141
|
+
os.chmod(tmp, 0o600) # 先给权限再替换,不留 0644 窗口
|
|
142
|
+
except OSError:
|
|
143
|
+
pass
|
|
144
|
+
os.replace(tmp, p)
|
|
145
|
+
|
|
146
|
+
|
|
147
|
+
def _verify_perms(p: Path) -> None:
|
|
148
|
+
"""S1 式写后验(借 huaweicloud-devkit ensurePrivateMode 模式):chmod 0600 并 stat
|
|
149
|
+
回验——不假设 chmod 按文档工作(WSL/drvfs 会静默忽略),验的是效果不是动作;
|
|
150
|
+
runtime.json 含 java_key 明文,权限失效必须告警。"""
|
|
72
151
|
try:
|
|
73
152
|
os.chmod(p, 0o600)
|
|
74
153
|
mode = stat.S_IMODE(os.stat(p).st_mode)
|
|
@@ -79,6 +158,41 @@ def _save_runtime(update: dict, replace: bool = False) -> None:
|
|
|
79
158
|
_warn(f"runtime.json 权限校验失败:{e}")
|
|
80
159
|
|
|
81
160
|
|
|
161
|
+
def _runtime_atomic(mutate) -> dict:
|
|
162
|
+
"""**事务式读改写**:进程内 RLock + 跨进程 flock 一起持,读 → mutate → 原子写。
|
|
163
|
+
|
|
164
|
+
为什么必须是事务(2026-11-16 第二轮评审实测):只给"写"上锁不够。调用方若在锁外
|
|
165
|
+
`_runtime_cfg()` 读到整份 submissions、再在锁内整键覆盖,后写者会盖掉先写者——
|
|
166
|
+
4 进程各 25 条账本只剩 40-53 条。凡是"读整键→改→写整键"的路径都必须走这里。
|
|
167
|
+
|
|
168
|
+
mutate(cfg) 返回 False 表示"不改、不用落盘"(例如账本被 local_ledger=false 关闭)。
|
|
169
|
+
返回最终落盘的 cfg 快照(调用方可据此更新内存镜像)。
|
|
170
|
+
"""
|
|
171
|
+
p = _runtime_path()
|
|
172
|
+
with _RT_LOCK:
|
|
173
|
+
p.parent.mkdir(parents=True, exist_ok=True)
|
|
174
|
+
with _file_lock():
|
|
175
|
+
cfg = _read_cfg_unlocked(p)
|
|
176
|
+
if mutate(cfg) is not False:
|
|
177
|
+
_write_cfg_unlocked(p, cfg)
|
|
178
|
+
_verify_perms(p)
|
|
179
|
+
return cfg
|
|
180
|
+
|
|
181
|
+
|
|
182
|
+
def _save_runtime(update: dict, replace: bool = False) -> None:
|
|
183
|
+
"""原子差分更新(公共 API):把 update 合并进现有 cfg。
|
|
184
|
+
|
|
185
|
+
内部整段持锁(进程内 + 跨进程),所以"不同顶层键"的并发更新不会互相覆盖。
|
|
186
|
+
需要"读整键→改→写整键"的调用方**不要**用它(那会丢失并发新增),改走
|
|
187
|
+
`_runtime_atomic(mutate)`。
|
|
188
|
+
"""
|
|
189
|
+
def _mutate(cfg: dict) -> None:
|
|
190
|
+
if replace:
|
|
191
|
+
cfg.clear()
|
|
192
|
+
cfg.update(update)
|
|
193
|
+
_runtime_atomic(_mutate)
|
|
194
|
+
|
|
195
|
+
|
|
82
196
|
def _log(line: str, path: str = "/tmp/vod_mcp_server.log") -> None:
|
|
83
197
|
"""统一日志出口,1MB 截断轮转
|
|
84
198
|
(D-key-guard-3⑤:客户机长期运行防无限增长;截断保留尾部近期日志)。"""
|
|
@@ -128,6 +242,13 @@ def _ensure_first_boot(rt_path: Path | None = None) -> dict:
|
|
|
128
242
|
自动清零伤害半径为零,拒启会把误判放大成全功能瘫痪。
|
|
129
243
|
firstBootAt 首启写入,此后不再触发(防误伤正常运行中的安装)。"""
|
|
130
244
|
p = rt_path or _runtime_path()
|
|
245
|
+
if rt_path is None:
|
|
246
|
+
# D-token-machine-1 首启迁移:state 无 runtime 而旧版本目录有 → 复制一次
|
|
247
|
+
# (保留 install_nonce/key/账本,改造当天不重领令牌、不换设备锚点)
|
|
248
|
+
mig = paths.migrate_state_once()
|
|
249
|
+
if mig.get("migrated"):
|
|
250
|
+
_log(f"state migrated: {mig['from']} -> {_runtime_path()}")
|
|
251
|
+
p = _runtime_path()
|
|
131
252
|
if not p.exists():
|
|
132
253
|
return {"action": "none"}
|
|
133
254
|
try:
|
|
@@ -288,13 +409,15 @@ def _ledger_append(entries: list) -> None:
|
|
|
288
409
|
vod_list_submitted 随之不可用——留痕是可选项不是义务。"""
|
|
289
410
|
if not entries:
|
|
290
411
|
return
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
if
|
|
294
|
-
return
|
|
295
|
-
ledger = (
|
|
412
|
+
|
|
413
|
+
def _mutate(cfg: dict):
|
|
414
|
+
if cfg.get("local_ledger") is False:
|
|
415
|
+
return False # 企业数据驻留:账本关闭,不写也不改
|
|
416
|
+
ledger = (cfg.get(_LEDGER_KEY) or [])[-_LEDGER_CAP:]
|
|
296
417
|
ledger.extend(entries)
|
|
297
|
-
|
|
418
|
+
cfg[_LEDGER_KEY] = ledger[-_LEDGER_CAP:]
|
|
419
|
+
|
|
420
|
+
_runtime_atomic(_mutate) # 读整键 → 改 → 写整键 必须整段在锁内
|
|
298
421
|
|
|
299
422
|
|
|
300
423
|
_DRAFT_KEY = "drafts"
|
|
@@ -15,7 +15,19 @@ from pathlib import Path
|
|
|
15
15
|
# 其余所有资源路径一律走 vod_mcp/paths.py(含 VOD_DEVKIT_ROOT 覆盖)。
|
|
16
16
|
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
|
17
17
|
|
|
18
|
-
|
|
18
|
+
# 解释器版本 guard 必须在 import vod_mcp 之前:本模块与下游(tools/guardrails)
|
|
19
|
+
# 的注解用了 PEP 604(`dict | None`),在 3.9 上会在 def 求值时抛 TypeError
|
|
20
|
+
# traceback——那是"响失败"但不可读。一行 guard 把残余风险变成可读诊断。
|
|
21
|
+
if sys.version_info < (3, 10):
|
|
22
|
+
sys.stderr.write(
|
|
23
|
+
"[vod-devkit] MCP server 需要 Python >= 3.10(当前 %d.%d)。\n"
|
|
24
|
+
" 插件 .mcp.json 的 command 若走 PATH 上的 python3,请指向 3.10+ 解释器"
|
|
25
|
+
"(如 /usr/bin/python3.12),\n"
|
|
26
|
+
" 或重跑安装器由它用本机 3.10+ 解释器重写该文件。\n"
|
|
27
|
+
% sys.version_info[:2])
|
|
28
|
+
sys.exit(2)
|
|
29
|
+
|
|
30
|
+
from vod_mcp import guardrails, packs, runtime_state, skills_registry, tools # noqa: E402
|
|
19
31
|
|
|
20
32
|
_PROTOCOL_VERSION = "2025-06-18"
|
|
21
33
|
_client_info = {}
|
|
@@ -29,10 +41,11 @@ def _error(req_id, code, message):
|
|
|
29
41
|
return {"jsonrpc": "2.0", "id": req_id, "error": {"code": code, "message": message}}
|
|
30
42
|
|
|
31
43
|
|
|
32
|
-
def handle(message: dict, client_info: dict | None = None) -> dict | None:
|
|
44
|
+
def handle(message: dict, client_info: dict | None = None) -> dict | list | None:
|
|
33
45
|
"""JSON-RPC 分派(两面共用:stdio 逐行调用;HTTP 面每请求调用一次)。
|
|
34
46
|
|
|
35
47
|
client_info 由传输层提供(HTTP 面=固定标识 + 认证形态,stdio 面=握手自报)。
|
|
48
|
+
返回 list 时=一条响应后跟通知(当前只有 tools/list_changed 这一处)。
|
|
36
49
|
"""
|
|
37
50
|
method = message.get("method", "")
|
|
38
51
|
req_id = message.get("id")
|
|
@@ -41,7 +54,9 @@ def handle(message: dict, client_info: dict | None = None) -> dict | None:
|
|
|
41
54
|
_client_info = client_info or (message.get("params") or {}).get("clientInfo") or {}
|
|
42
55
|
return _result(req_id, {
|
|
43
56
|
"protocolVersion": _PROTOCOL_VERSION,
|
|
44
|
-
|
|
57
|
+
# listChanged:会话内开关(vod_packs_configure)改工具面后由服务端推
|
|
58
|
+
# notifications/tools/list_changed;不声明的话合规客户端不会重拉 tools/list。
|
|
59
|
+
"capabilities": {"tools": {"listChanged": True}},
|
|
45
60
|
"instructions": (
|
|
46
61
|
"vod-devkit 采集资产与纪律:技能 vod-feedback-collect 处理用户对"
|
|
47
62
|
"本产品的不满/建议/期望(触发词:慢/报错/体验差/希望支持/提单等)。"
|
|
@@ -50,6 +65,13 @@ def handle(message: dict, client_info: dict | None = None) -> dict | None:
|
|
|
50
65
|
"禁止改写、概括、增删字词。product 归因:原话唯一命中可直接用;"
|
|
51
66
|
"未命中或多产品歧义时必须问用户一次\"这条是哪个产品的反馈\","
|
|
52
67
|
"回答填 product;用户说不知道就告知他缺产品不能提交,不要猜。不许不填直接提交。"
|
|
68
|
+
# 技能读取教法(对齐 devkit 的"动作优先"):树路径在 initialize 就给,
|
|
69
|
+
# 让 agent 不必先调目录工具;先直读、被拒再回落、不反复请求。
|
|
70
|
+
" 技能树:" + str(skills_registry.SKILLS_ROOT)
|
|
71
|
+
+ "(本机路径)。读法=动作优先:先直接读 "
|
|
72
|
+
"skillRoot/<技能名>/SKILL.md(尝试本身即可达性检查,不做预判);"
|
|
73
|
+
"被拒或读取失败才用 vod_retrieve_skill 取全文(无需文件权限),"
|
|
74
|
+
"绝不反复请求。"
|
|
53
75
|
),
|
|
54
76
|
"serverInfo": {
|
|
55
77
|
"name": "vod-devkit",
|
|
@@ -71,11 +93,17 @@ def handle(message: dict, client_info: dict | None = None) -> dict | None:
|
|
|
71
93
|
return _error(req_id, code, msg)
|
|
72
94
|
try:
|
|
73
95
|
out = tools.dispatch(name, args, _client_info)
|
|
74
|
-
|
|
96
|
+
resp = _result(req_id, {
|
|
75
97
|
"content": [{"type": "text", "text": json.dumps(out, ensure_ascii=False)}],
|
|
76
98
|
"structuredContent": out,
|
|
77
99
|
"isError": False,
|
|
78
100
|
})
|
|
101
|
+
# 会话内开关改了工具面 → 按 MCP 规范推通知(stdio 面只有这一处增量输出;
|
|
102
|
+
# 远程面每请求现造 server 无会话,该工具已在 REMOTE_WITHHELD 里摘除)
|
|
103
|
+
if name == "vod_packs_configure" and isinstance(out, dict) and out.get("changed"):
|
|
104
|
+
return [resp, {"jsonrpc": "2.0",
|
|
105
|
+
"method": "notifications/tools/list_changed"}]
|
|
106
|
+
return resp
|
|
79
107
|
except tools.ToolError as e:
|
|
80
108
|
return _error(req_id, e.code, str(e))
|
|
81
109
|
if req_id is not None:
|
|
@@ -93,6 +121,10 @@ def _consume_payload_marker() -> None:
|
|
|
93
121
|
|
|
94
122
|
|
|
95
123
|
def main():
|
|
124
|
+
# 入口显式设根(宿主直接按脚本路径拉起时,这里就是"入口")
|
|
125
|
+
from vod_mcp import paths as _paths
|
|
126
|
+
os.environ.setdefault("VOD_DEVKIT_SRC_ROOT", str(_paths.SRC_ROOT))
|
|
127
|
+
os.environ.setdefault("VOD_DEVKIT_DIST_ROOT", str(_paths.DIST_ROOT))
|
|
96
128
|
_consume_payload_marker()
|
|
97
129
|
import argparse
|
|
98
130
|
ap = argparse.ArgumentParser(prog="vod-mcp-server",
|
|
@@ -102,8 +134,19 @@ def main():
|
|
|
102
134
|
"一个进程服务多个 agent)")
|
|
103
135
|
ap.add_argument("--port", type=int, default=9528, help="remote 端口(默认 9528)")
|
|
104
136
|
ap.add_argument("--host", default="127.0.0.1", help="remote 绑定地址(默认回环)")
|
|
137
|
+
ap.add_argument("--allow-anon-mint", action="store_true",
|
|
138
|
+
help="非回环绑定时仍允许服务端代领匿名令牌(默认关闭;"
|
|
139
|
+
"单机可信网络才开,见 D-token-machine-1)")
|
|
105
140
|
args, _unknown = ap.parse_known_args()
|
|
106
141
|
|
|
142
|
+
# VOD_PACKS 未知 id 启动即报错(D-packs-config-1,对齐 devkit 口径):
|
|
143
|
+
# 静默过滤会让"配了"和"生效"分叉,排障时没人能看出是拼写错还是没装。
|
|
144
|
+
try:
|
|
145
|
+
packs.enabled_packs()
|
|
146
|
+
except packs.UnknownPack as e:
|
|
147
|
+
print(f"[vod-devkit] {e}", file=sys.stderr)
|
|
148
|
+
sys.exit(2)
|
|
149
|
+
|
|
107
150
|
# 启动自诊(排障:写 /tmp,宿主过滤环境变量时可观察实际 env)
|
|
108
151
|
try:
|
|
109
152
|
runtime_state._ensure_first_boot() # D-key-guard-3①:首启标记+构建机残留清理(preset 兜底)
|
|
@@ -121,7 +164,7 @@ def main():
|
|
|
121
164
|
" pip install 'vod-devkit[remote]' # 或 pip install 'mcp>=1.0'\n"
|
|
122
165
|
f"(stdio 形态不需要任何第三方依赖;导入失败:{e})", file=sys.stderr)
|
|
123
166
|
sys.exit(2)
|
|
124
|
-
sys.exit(transport_remote.serve(args.host, args.port))
|
|
167
|
+
sys.exit(transport_remote.serve(args.host, args.port, args.allow_anon_mint))
|
|
125
168
|
|
|
126
169
|
for line in sys.stdin:
|
|
127
170
|
line = line.strip()
|
|
@@ -133,8 +176,10 @@ def main():
|
|
|
133
176
|
resp = _error(None, -32700, "解析错误")
|
|
134
177
|
else:
|
|
135
178
|
resp = handle(message)
|
|
136
|
-
if resp is not None
|
|
137
|
-
|
|
179
|
+
out_msgs = resp if isinstance(resp, list) else ([resp] if resp is not None else [])
|
|
180
|
+
for m in out_msgs:
|
|
181
|
+
sys.stdout.write(json.dumps(m, ensure_ascii=False) + "\n")
|
|
182
|
+
if out_msgs:
|
|
138
183
|
sys.stdout.flush()
|
|
139
184
|
|
|
140
185
|
|